From 802cba3fb84e68a6088f2db10792a1761972f67a Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 9 Nov 2015 13:32:59 +0100 Subject: [PATCH] CSS: Move variables from themes/icinga.less to base.less refs #5543 --- library/Icinga/Web/StyleSheet.php | 5 ++-- public/css/icinga/base.less | 37 ++++++++++++++++++++++++++++ public/css/icinga/themes/icinga.less | 34 ------------------------- 3 files changed, 39 insertions(+), 37 deletions(-) delete mode 100644 public/css/icinga/themes/icinga.less diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php index f664447855..9d5a420904 100644 --- 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 index ef5eeb36e4..7355aa0066 100644 --- 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-bg-color: #fff; + +// Text colors +@text-color: #535353; +@text-color-inverted: @body-bg-color; +@text-color-light: @gray; + +// Text color on +@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 deleted file mode 100644 index f1d6247a61..0000000000 --- a/public/css/icinga/themes/icinga.less +++ /dev/null @@ -1,34 +0,0 @@ -// 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-bg-color: #fff; - -// Text colors -@text-color: #535353; -@text-color-inverted: @body-bg-color; -@text-color-light: @gray; - -// Text color on -@link-color: @text-color; - -@font-family: Calibri, Helvetica, sans-serif; -@font-family-fixed: "Liberation Mono", "Lucida Console", Courier, monospace; -@font-family-wide: Tahoma, Verdana, sans-serif;