CSS: Move variables from themes/icinga.less to base.less

refs #5543
Icinga · Nov 9, 2015 · 802cba3 · 802cba3
1 parent 8c13583
commit 802cba3
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 37 deletions.
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
@@ -13,12 +13,11 @@ class StyleSheet
         '../application/fonts/fontello-ifont/css/ifont-embedded.css',
         'css/vendor/normalize.css',
         'css/vendor/tipsy.css',
-        'css/icinga/themes/icinga.less',
+        'css/icinga/base.less',
         'css/icinga/colors.less',
         'css/icinga/badges.less',
         'css/icinga/mixins.less',
         'css/icinga/grid.less',
-        'css/icinga/base.less',
         'css/icinga/nav.less',
         'css/icinga/main.less',
         'css/icinga/limiter.less',
@@ -40,7 +39,7 @@ class StyleSheet
         'css/icinga/dev.less',
 //        'css/icinga/logo.less',
         'css/icinga/spinner.less',
-        'css/icinga/compat.less',
+        'css/icinga/compat.less'
     );
 
     public static function compileForPdf()

diff --git a/public/css/icinga/base.less b/public/css/icinga/base.less
@@ -1,5 +1,42 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+// Gray colors
+@gray: #7F7F7F;
+@gray-light: #C9C9C9;
+@gray-lighter: #EEEEEE;
+@gray-lightest: #F7F7F7;
+
+// Icinga colors
+@icinga-blue: #0095BF;
+@icinga-blue-dark: #AA95BF;
+@color-ok: #44bb77;
+@color-warning: #ffaa44;
+@color-warning-handled: #ffcc66;
+@color-critical: #ff5566;
+@color-critical-handled: #ff99aa;
+@color-unknown: #aa44ff;
+@color-unknown-handled: #cc77ff;
+@color-unreachable: #aa44ff;
+@color-unreachable-handled: #cc77ff;
+@color-pending: #77aaff;
+
+// Background color for <body>
+@body-bg-color: #fff;
+
+// Text colors
+@text-color: #535353;
+@text-color-inverted: @body-bg-color;
+@text-color-light: @gray;
+
+// Text color on <a>
+@link-color: @text-color;
+
+// Font families
+@font-family: Calibri, Helvetica, sans-serif;
+@font-family-fixed: "Liberation Mono", "Lucida Console", Courier, monospace;
+@font-family-wide: Tahoma, Verdana, sans-serif;
+
+// Font sizes
 @font-size: 0.750em; // 12px
 @font-size-small: 0.833em; // 10px
 @font-weight-bold: 600;

diff --git a/public/css/icinga/themes/icinga.less b/public/css/icinga/themes/icinga.less