[icinga-checkins] icinga.org: icingaweb2/master: css: allow to override vendor styles

git at icinga.org git at icinga.org
Wed Nov 19 10:34:05 CET 2014


Module: icingaweb2
Branch: master
Commit: 47d81ccf7bef240471a305e69d6c5a1720f75f01
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=47d81ccf7bef240471a305e69d6c5a1720f75f01

Author: Thomas Gelf <thomas at gelf.net>
Date:   Wed Nov 19 10:31:51 2014 +0100

css: allow to override vendor styles

* no more hovered icon underline
* simulate padding for headers in .controls

---

 application/fonts/fontello-ifont/css/ifont-embedded.css |    2 +-
 library/Icinga/Web/StyleSheet.php                       |    6 +++---
 public/css/icinga/main-content.less                     |    9 +++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/fonts/fontello-ifont/css/ifont-embedded.css b/application/fonts/fontello-ifont/css/ifont-embedded.css
index 593eb8b..92bcfdf 100644
--- a/application/fonts/fontello-ifont/css/ifont-embedded.css
+++ b/application/fonts/fontello-ifont/css/ifont-embedded.css
@@ -167,4 +167,4 @@
 .icon-chart-area:before { content: '\e870'; } /* '' */
 .icon-chart-bar:before { content: '\e871'; } /* '' */
 .icon-beaker:before { content: '\e872'; } /* '' */
-.icon-magic:before { content: '\e873'; } /* '' */
\ No newline at end of file
+.icon-magic:before { content: '\e873'; } /* '' */
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index b40b379..719d1c8 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -11,6 +11,8 @@ use Icinga\Web\LessCompiler;
 class StyleSheet
 {
     protected static $lessFiles = array(
+        '../application/fonts/fontello-ifont/css/ifont-embedded.css',
+        'css/vendor/tipsy.css',
         'css/icinga/defaults.less',
         'css/icinga/layout-colors.less',
         'css/icinga/layout-structure.less',
@@ -24,9 +26,7 @@ class StyleSheet
         'css/icinga/pagination.less',
         'css/icinga/monitoring-colors.less',
         'css/icinga/selection-toolbar.less',
-        'css/icinga/login.less',
-        '../application/fonts/fontello-ifont/css/ifont-embedded.css',
-        'css/vendor/tipsy.css'
+        'css/icinga/login.less'
     );
 
     public static function compileForPdf()
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 7f6914e..6972e95 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -193,3 +193,12 @@ table.benchmark {
 .controls a {
   color: inherit;
 }
+
+/* controls have no padding as of tabs */
+.controls > h1 {
+  margin-right: 1em;
+}
+
+[class^="icon-"]:before, [class*=" icon-"]:before {
+    text-decoration: none;
+}



More information about the icinga-checkins mailing list