From 7aef0581f314b7bec293c3a2d8d689a37588bf21 Mon Sep 17 00:00:00 2001 From: Bernd Erk Date: Thu, 6 Nov 2014 22:55:17 +0100 Subject: [PATCH] Changed to color codes using less --- modules/monitoring/public/css/module.less | 4 ++-- public/css/icinga/layout-colors.less | 3 ++- public/css/icinga/layout-structure.less | 2 +- public/css/icinga/main-content.less | 2 +- public/css/icinga/menu.less | 18 +++++++++--------- public/css/icinga/monitoring-colors.less | 18 +++++++++--------- public/css/icinga/pagination.less | 4 +--- public/css/icinga/tabs.less | 8 ++++---- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less index 312255784..96bd17a6b 100644 --- a/modules/monitoring/public/css/module.less +++ b/modules/monitoring/public/css/module.less @@ -61,7 +61,7 @@ div.contacts div.contact { } div.contacts div.contact a{ - color: #666; + color: @colorTextDefault; } div.contacts div.contact > img { @@ -81,7 +81,7 @@ h3.tinystatesummary { padding-left: 1em; margin-right: 1em; background-color: #eee; - color: #666; + color: @colorTextDefault; border: 1px solid #d9d9d9; border-left: 5px solid #049baf; } diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less index aa11f3288..dcfbe8fe0 100644 --- a/public/css/icinga/layout-colors.less +++ b/public/css/icinga/layout-colors.less @@ -41,7 +41,8 @@ } @colorLinkDefault: #049baf; -@colorTextDefault: #222222; +@colorTextDefault: #666; +@colorTextDarkDefault: #555; @colorOk: #44bb77; @colorWarning: #ffaa44; @colorWarningHandled: #ffcc66; diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less index 43c030154..edf771510 100644 --- a/public/css/icinga/layout-structure.less +++ b/public/css/icinga/layout-structure.less @@ -154,7 +154,7 @@ html { font-size: 0.95em; padding-left: 1em; background-color: #eee; - color: #666; + color: @colorTextDefault; border: 1px solid #d9d9d9; border-left: 5px solid #049baf; } diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less index d280d56e8..dd9c89c92 100644 --- a/public/css/icinga/main-content.less +++ b/public/css/icinga/main-content.less @@ -67,7 +67,7 @@ img.icon { } table.avp { - color: #555; + color: @colorTextDarkDefault; table-layout: auto; width: 100%; font-size: 0.9em; diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less index f42d8c524..842da8051 100644 --- a/public/css/icinga/menu.less +++ b/public/css/icinga/menu.less @@ -54,7 +54,7 @@ } #menu > ul > li.active > a { - color: #666; + color: @colorTextDefault; text-shadow: none; } @@ -63,11 +63,11 @@ } #menu > ul > li.active li a:focus { - color: #666; + color: @colorTextDefault; } #menu > ul > li > a:focus { - color: #666; + color: @colorTextDefault; text-shadow: none; } @@ -86,12 +86,12 @@ /* Collapsed menu item color */ #menu > ul > li > a { - color: #666; + color: @colorTextDefault; } /* Sub item color */ #menu .active ul li a { - color: #666; + color: @colorTextDefault; } #menu ul { @@ -219,7 +219,7 @@ background-image: url('../img/icons/search.png'); background-repeat: no-repeat; background-position: 1.2em center; - color: #666; + color: @colorTextDefault; border-bottom: 1px solid #d9d9d9; } @@ -228,15 +228,15 @@ html.ie8 #menu input.search { } #menu input.search:-ms-input-placeholder { - color: #666; + color: @colorTextDefault; } #menu input.search::-webkit-input-placeholder { - color: #666; + color: @colorTextDefault; } #menu input.search::-moz-placeholder { - color: #666; + color: @colorTextDefault; opacity: 1; } diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less index 0a51e024b..d61a5b017 100644 --- a/public/css/icinga/monitoring-colors.less +++ b/public/css/icinga/monitoring-colors.less @@ -26,7 +26,7 @@ table.action { width: 100%; table-layout: fixed; margin: 0; - color: #666; + color: @colorTextDefault; } table.action th { @@ -59,7 +59,7 @@ table.action td .pluginoutput { table.action td a { color: inherit; text-decoration: none; - color: #555; + color: @colorTextDarkDefault; } table.action td a:hover { @@ -290,14 +290,14 @@ a.critical { margin-top: 0; margin-bottom: 0.6em; font-size: 0.8em; - color: #666; + color: @colorTextDefault; } .boxview div.box h2:first-child { margin-top: 0.2em; padding-bottom: 0.5em; font-size: inherit; - color: #666; + color: @colorTextDefault; border-bottom: 1px solid #d9d9d9; } @@ -348,7 +348,7 @@ a.critical { font-size: 0.9em; white-space: nowrap; - color: #666; + color: @colorTextDefault; } /* Any line of a box entry */ @@ -359,7 +359,7 @@ a.critical { } .boxview div.box.entry a:hover { - color: #666; + color: @colorTextDefault; } /* First line of a box entry */ @@ -423,7 +423,7 @@ div.box.entry.handled { } div.box.entry.handled a:hover { - color: #666; + color: @colorTextDefault; } /* Tactical overview element styles */ @@ -593,7 +593,7 @@ table.pivot { color: black; &:hover { - color: #666; + color: @colorTextDefault; } } @@ -747,7 +747,7 @@ div.timeline { white-space: nowrap; &:hover { - color: #666; + color: @colorTextDefault; } } } diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less index 8d1f2ee55..e52b28403 100644 --- a/public/css/icinga/pagination.less +++ b/public/css/icinga/pagination.less @@ -34,7 +34,7 @@ ul.pagination { } .pagination > li > a { - color: #555; + color: @colorTextDarkDefault; text-decoration: none; outline: 0; } @@ -45,12 +45,10 @@ ul.pagination { } .pagination > li:last-child > a, .pagination > li:last-child > span { - border-radius: 0 0.5em 0.5em 0; border-right-width: 1px; } .pagination > li:first-child > a, .pagination > li:first-child > span { - border-radius: 0.5em 0 0 0.5em; } .pagination > li > a:hover { diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less index c3e25e544..083b53451 100644 --- a/public/css/icinga/tabs.less +++ b/public/css/icinga/tabs.less @@ -37,13 +37,13 @@ ul.tabs > li > a { } ul.tabs > li > a:focus { - color: #666; + color: @colorTextDefault; text-shadow: none; } ul.tabs > li.active > a:focus { text-shadow: none; - color: #666; + color: @colorTextDefault; } ul.tabs li.dropdown > a{ @@ -107,7 +107,7 @@ ul.tabs ul.dropdown-menu { } ul.tabs ul.dropdown-menu li a { - color: #555; + color: @colorTextDarkDefault; margin: 0em; } @@ -122,7 +122,7 @@ ul.tabs ul.dropdown-menu li a:hover, ul.tabs ul.dropdown-menu li a:focus { ul.tabs li.dropdown:hover a { text-decoration: none; - color: #555; + color: @colorTextDarkDefault; } li.dropdown:hover ul.dropdown-menu, li.dropdown.hover ul.dropdown-menu {