[checkmk-commits] Started applying GUI color set changes; cleaning up

Module: check_mk Branch: master Commit: a4b481fa626244606605985b795cdc615bb97770 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4b481fa626244… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Apr 11 07:43:02 2017 +0200 Started applying GUI color set changes; cleaning up Change-Id: Ic22ad3031f2603727382a6a24acc8469adcc3cfa --- web/htdocs/html_mod_python.py | 4 ++++ web/htdocs/sidebar.css | 7 +++++++ web/plugins/sidebar/wato.py | 7 ------- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 074c80d..9623666 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -296,6 +296,10 @@ class html_mod_python(htmllib.html): if config.custom_style_sheet: self.write('<link rel="stylesheet" type="text/css" href="%s">\n' % config.custom_style_sheet) + if cmk.is_managed_edition(): + import gui_colors + gui_colors.GUIColors().render_html() + def plugin_stylesheets(self): plugin_stylesheets = set([]) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 1e5b7b0..fa94229 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -255,6 +255,13 @@ div.snapin div.content { width: 228px; } +div.snapin select { + background-color: #6da1b8; + color: #fff; + border-color: #123a4a; + font-size: 8pt; +} + /* * General styles for snapin contents */ diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 1aa6209..d0360f3 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -284,13 +284,6 @@ sidebar_snapins['wato_foldertree'] = { width: 190px; height: 19px; margin-bottom: 2px; - background-color: #6da1b8; - color: #fff; - border-color: #123a4a; - font-size: 8pt; -} -#snapin_wato_foldertree select option { - background-color: #6da1b8; } #snapin_wato_foldertree span { margin-top: 1px;