CSS: Combine header-, footer-elements and layout-colors in layout.less

library/Icinga/Web/StyleSheet.php

@@ -37,11 +37,9 @@ class StyleSheet
         'css/icinga/nav.less',
         'css/icinga/main.less',
         'css/icinga/animation.less',
-        'css/icinga/layout-colors.less',
+        'css/icinga/layout.less',
         'css/icinga/layout-structure.less',
         'css/icinga/menu.less',
-        'css/icinga/header-elements.less',
-        'css/icinga/footer-elements.less',
 //        'css/icinga/main-content.less',
         'css/icinga/tabs.less',
         'css/icinga/forms.less',

public/css/icinga/base.less

@@ -137,14 +137,3 @@ td, th {
     margin-left: 0;
   }
 }
-
-#layout {
-  background-color: @body-bg-color;
-  color: @text-color;
-  font-family: @font-family;
-}
-
-#main > .container, #menu, #header {
-  font-size: @font-size;
-  line-height: @line-height;
-}

public/css/icinga/header-elements.less

@@ -1,18 +0,0 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-#logo {
-  height: 4em;
-  margin-left: 1.5em;
-  margin-top: 0.2em;
-  margin-bottom: 0.2em;
-  width: 100px;
-}
-
-#logo > a {
-  background-image: url('../img/logo_icinga-inv.png');
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: contain;
-  display: block;
-  height: 100%;
-}

public/css/icinga/layout-colors.less

@@ -1,37 +0,0 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-/* Layout colors */
-
-#sidebar {
-  background-color: @gray-lighter;
-}
-
-#header {
-  background-color: @icinga-blue;
-  color: #ddd;
-  color: #d0d0d0;
-}
-
-#header input {
-  background-color: #777;
-}
-
-#main {
-  background-color: white;
-}
-
-#col1.impact, #col2.impact, #col3.impact {
-  background-color: #ddd;
-  transition: background-color 2s 1s linear;
-  -moz-transition: background-color 2s 1s linear;
-  -o-transition: background-color 2s 1s linear;
-  -webkit-transition: background-color 2s 1s linear;
-  .controls {
-    background-color: #ddd;
-    transition: background-color 2s 1s linear;
-    -moz-transition: background-color 2s 1s linear;
-    -o-transition: background-color 2s 1s linear;
-    -webkit-transition: background-color 2s 1s linear;
-  }
-}
-

public/css/icinga/layout-structure.less

@@ -96,7 +96,6 @@ html {
   .controls > ul.tabs {
     margin-top: 0;
     height: 1.5em;
-    background-color: @icinga-blue;
     font-size: 0.75em;
     padding: 0.2em 0 0;
   }
@@ -138,7 +137,6 @@ html {
 */
 .container .controls {
   top: 0;
-  background-color: white;
   padding: 1em 1em 0;
   z-index: 100;
 

public/css/icinga/layout.less

@@ -1,14 +1,52 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-div#footer {
+#footer {
   position: fixed;
-  left: 0px;
-  right: 0px;
-  bottom: 0px;
-  z-index: 9999;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
 }
 
-/** Notifications **/
+#header,
+#main > .container,
+#menu {
+  font-size: @font-size;
+  line-height: @line-height;
+}
+
+#header {
+  background-color: @icinga-blue;
+}
+
+#layout {
+  background-color: @body-bg-color;
+  color: @text-color;
+  font-family: @font-family;
+}
+
+#logo {
+  height: 4em;
+  margin-left: 1.5em;
+  margin-top: 0.2em;
+  margin-bottom: 0.2em;
+  width: 100px;
+}
+
+#logo > a {
+  background-image: url('../img/logo_icinga-inv.png');
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: contain;
+  display: block;
+  height: 100%;
+}
+
+#sidebar {
+  background-color: @gray-lighter;
+}
+
+// Notification styles
 
 #notifications {
   margin: 0;
@@ -47,4 +85,3 @@ div#footer {
   background-image: url(../img/icons/success.png);
   color: #333;
 }
-/** END of Notifications **/