Merge branch 'master' into feature/introduce-tests

Geeklog-Core · Nov 11, 2016 · 9d08ebe · 9d08ebe
2 parents fae0bfa + 17785bb
commit 9d08ebe
Show file tree

Hide file tree

Showing 21 changed files with 812 additions and 169 deletions.
diff --git a/public_html/layout/denim/css_ltr/style.almost-flat.css b/public_html/layout/denim/css_ltr/style.almost-flat.css
@@ -1974,30 +1974,30 @@ body.center-right #config_content {
   Header Content
 --------------------------------------*/
 
-#header {
+#header.brand-text {
   padding: 0;
   background-color: #426F9C;
   height: 80px;
 }
 
 @media only screen and (max-width: 767px) {
 
-  #header {
+  #header.brand-text {
     padding: 0;
     border: none;
   }
 }
 
 @media only screen and (max-width: 767px) {
 
-  #header {
+  #header.brand-text {
     height: 80px;
     margin-top: 0;
   }
 }
 
 /* Site Name */
-.site_name {
+.brand-text .site_name {
   position: relative;
   float: left;
   font-size: 30px;
@@ -2008,16 +2008,16 @@ body.center-right #config_content {
   padding: 0;
 }
 
-.site_name a:link,
-.site_name a:visited,
-.site_name a:hover {
+.brand-text .site_name a:link,
+.brand-text .site_name a:visited,
+.brand-text .site_name a:hover {
   color: #EEE;
   text-decoration: none;
 }
 
 @media only screen and (max-width: 767px) {
 
-  .site_name {
+  .brand-text .site_name {
     float: none;
     font-size: 1.6em;
     height: 50px;
@@ -2028,7 +2028,98 @@ body.center-right #config_content {
 }
 
 /* Slogan */
-.site_slogan {
+.brand-text .site_slogan {
+  position: relative;
+  margin: 0;
+  padding: 16px 16px 0 16px;
+  float: right;
+  color: #FFF;
+  text-align: right;
+  text-shadow: 0 1px 1px rgba(0,0,0,.3);
+}
+
+@media only screen and (max-width: 767px) {
+
+  .brand-text .site_slogan {
+    font-size: 75%;
+    float: none;
+    margin: 0 auto;
+    padding: 0;
+    text-align: center;
+    line-height: 1.2em;
+  }
+}
+
+@media only screen and (max-width: 767px) {
+
+  .brand-text .nameplate {
+    float: none;
+    height: 100%;
+    margin: 0 auto;
+    max-width: 230px;
+    text-align: center;
+  }
+}
+
+#header.brand-image {
+  padding: 0;
+  background-color: #426F9C;
+  height: 120px;
+}
+
+@media only screen and (max-width: 767px) {
+
+  #header.brand-image {
+    padding: 0;
+    border: none;
+  }
+}
+
+@media only screen and (max-width: 767px) {
+
+  #header.brand-image {
+    height: 80px;
+    margin-top: 0;
+  }
+}
+
+/* Site Name */
+.brand-image .site_name {
+  position: relative;
+  margin: 20px 0 0 16px;
+  padding: 0;
+  float: left;
+  width: 226px;
+  height: 80px;
+}
+
+.brand-image .site_name a {
+  background: url("../images/logo2.png") 0 0 no-repeat;
+  text-indent: -3000px;
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
+@media only screen and (max-width: 767px) {
+
+  .brand-image .site_name {
+    margin: 0 auto;
+    padding: 10px 0;
+    float: none;
+    width: 98.875px;
+    height: 35px;
+  }
+
+  .brand-image .site_name a {
+    -webkit-background-size: 98.875px auto;
+    -moz-background-size: 98.875px auto;
+    background-size: 98.875px auto;
+  }
+}
+
+/* Slogan */
+.brand-image .site_slogan {
   position: relative;
   margin: 0;
   padding: 16px 16px 0 16px;
@@ -2040,7 +2131,7 @@ body.center-right #config_content {
 
 @media only screen and (max-width: 767px) {
 
-  .site_slogan {
+  .brand-image .site_slogan {
     font-size: 75%;
     float: none;
     margin: 0 auto;
@@ -2052,7 +2143,7 @@ body.center-right #config_content {
 
 @media only screen and (max-width: 767px) {
 
-  .nameplate {
+  .brand-image .nameplate {
     float: none;
     height: 100%;
     margin: 0 auto;

diff --git a/public_html/layout/denim/css_ltr/style.almost-flat.min.css b/public_html/layout/denim/css_ltr/style.almost-flat.min.css
diff --git a/public_html/layout/denim/css_ltr/style.css b/public_html/layout/denim/css_ltr/style.css
@@ -1932,30 +1932,30 @@ body.center-right #config_content {
   Header Content
 --------------------------------------*/
 
-#header {
+#header.brand-text {
   padding: 0;
   background-color: #426F9C;
   height: 80px;
 }
 
 @media only screen and (max-width: 767px) {
 
-  #header {
+  #header.brand-text {
     padding: 0;
     border: none;
   }
 }
 
 @media only screen and (max-width: 767px) {
 
-  #header {
+  #header.brand-text {
     height: 80px;
     margin-top: 0;
   }
 }
 
 /* Site Name */
-.site_name {
+.brand-text .site_name {
   position: relative;
   float: left;
   font-size: 30px;
@@ -1966,16 +1966,16 @@ body.center-right #config_content {
   padding: 0;
 }
 
-.site_name a:link,
-.site_name a:visited,
-.site_name a:hover {
+.brand-text .site_name a:link,
+.brand-text .site_name a:visited,
+.brand-text .site_name a:hover {
   color: #EEE;
   text-decoration: none;
 }
 
 @media only screen and (max-width: 767px) {
 
-  .site_name {
+  .brand-text .site_name {
     float: none;
     font-size: 1.6em;
     height: 50px;
@@ -1986,7 +1986,98 @@ body.center-right #config_content {
 }
 
 /* Slogan */
-.site_slogan {
+.brand-text .site_slogan {
+  position: relative;
+  margin: 0;
+  padding: 16px 16px 0 16px;
+  float: right;
+  color: #FFF;
+  text-align: right;
+  text-shadow: 0 1px 1px rgba(0,0,0,.3);
+}
+
+@media only screen and (max-width: 767px) {
+
+  .brand-text .site_slogan {
+    font-size: 75%;
+    float: none;
+    margin: 0 auto;
+    padding: 0;
+    text-align: center;
+    line-height: 1.2em;
+  }
+}
+
+@media only screen and (max-width: 767px) {
+
+  .brand-text .nameplate {
+    float: none;
+    height: 100%;
+    margin: 0 auto;
+    max-width: 230px;
+    text-align: center;
+  }
+}
+
+#header.brand-image {
+  padding: 0;
+  background-color: #426F9C;
+  height: 120px;
+}
+
+@media only screen and (max-width: 767px) {
+
+  #header.brand-image {
+    padding: 0;
+    border: none;
+  }
+}
+
+@media only screen and (max-width: 767px) {
+
+  #header.brand-image {
+    height: 80px;
+    margin-top: 0;
+  }
+}
+
+/* Site Name */
+.brand-image .site_name {
+  position: relative;
+  margin: 20px 0 0 16px;
+  padding: 0;
+  float: left;
+  width: 226px;
+  height: 80px;
+}
+
+.brand-image .site_name a {
+  background: url("../images/logo2.png") 0 0 no-repeat;
+  text-indent: -3000px;
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
+@media only screen and (max-width: 767px) {
+
+  .brand-image .site_name {
+    margin: 0 auto;
+    padding: 10px 0;
+    float: none;
+    width: 98.875px;
+    height: 35px;
+  }
+
+  .brand-image .site_name a {
+    -webkit-background-size: 98.875px auto;
+    -moz-background-size: 98.875px auto;
+    background-size: 98.875px auto;
+  }
+}
+
+/* Slogan */
+.brand-image .site_slogan {
   position: relative;
   margin: 0;
   padding: 16px 16px 0 16px;
@@ -1998,7 +2089,7 @@ body.center-right #config_content {
 
 @media only screen and (max-width: 767px) {
 
-  .site_slogan {
+  .brand-image .site_slogan {
     font-size: 75%;
     float: none;
     margin: 0 auto;
@@ -2010,7 +2101,7 @@ body.center-right #config_content {
 
 @media only screen and (max-width: 767px) {
 
-  .nameplate {
+  .brand-image .nameplate {
     float: none;
     height: 100%;
     margin: 0 auto;