Merge branch 'develop'

[rbdr/r.bdr.sh] / jekyll / css / application.css

diff --git a/jekyll/css/application.css b/jekyll/css/application.css
index 43c15f8f5da148690d744142a779ae3641228730..770d614309478c6d726e9a0e78e1d7c5b9a3f1c2 100644 (file)
--- a/jekyll/css/application.css
+++ b/jekyll/css/application.css
@@ -12,10 +12,9 @@ header a, header a:visited {
   color: black;
 }
 
   color: black;
 }
 

-h1,
-h2 {
+h1, h2 {

   display: inline-block;
   display: inline-block;

-  margin-left: 10px;
+  margin-left: 1rem;

   font-weight: 300;
 }
 
   font-weight: 300;
 }
 


@@ -26,7 +25,7 @@ header {
   text-transform: uppercase;
 }
 
   text-transform: uppercase;
 }
 

-h1 {
+h1, h2 {

   font-size: 4.8em;
 }
 
   font-size: 4.8em;
 }
 


@@ -39,7 +38,7 @@ a:visited {
 }
 
 ul, p {
 }
 
 ul, p {

-  font-size: 1.8em;
+  font-size: 1.8rem;

   line-height: 1.28em;
   margin-left: 1em;
   max-width: 50em;
   line-height: 1.28em;
   margin-left: 1em;
   max-width: 50em;


@@ -50,9 +49,10 @@ li {
   display: block;
 }
 
   display: block;
 }
 

-li article {
+li p {

   display: inline-block;
   line-height: 1.82em;
   display: inline-block;
   line-height: 1.82em;

+  margin: 0;

 }
 
 span {
 }
 
 span {


@@ -66,7 +66,7 @@ video {
   max-width: 100vw;
 }
 
   max-width: 100vw;
 }
 

-header a, li article, h2, h3, p {
+header a, h1, h2, p {

   background-color: white;
 }
 
   background-color: white;
 }
 


@@ -97,7 +97,7 @@ header a, li article, h2, h3, p {
     color: #FFEC27;
   }
 
     color: #FFEC27;
   }
 

-  header a, li article, h1, h2, p {
+  header a, h1, h2, p {

     background-color: black;
   }
 }
     background-color: black;
   }
 }