From b64bf06df7944b08f40aa9b085402a4f4401f989 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 12 Nov 2015 13:07:35 +0100 Subject: [PATCH] CSS: Move limiter and pagination styles to controls.less refs #5543 --- library/Icinga/Web/StyleSheet.php | 2 -- public/css/icinga/controls.less | 49 +++++++++++++++++++++++++++++++ public/css/icinga/limiter.less | 19 ------------ public/css/icinga/pagination.less | 32 -------------------- 4 files changed, 49 insertions(+), 53 deletions(-) delete mode 100644 public/css/icinga/limiter.less delete mode 100644 public/css/icinga/pagination.less diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php index 9d5a42090..ef649d233 100644 --- a/library/Icinga/Web/StyleSheet.php +++ b/library/Icinga/Web/StyleSheet.php @@ -20,7 +20,6 @@ class StyleSheet 'css/icinga/grid.less', 'css/icinga/nav.less', 'css/icinga/main.less', - 'css/icinga/limiter.less', 'css/icinga/animation.less', 'css/icinga/layout-colors.less', 'css/icinga/layout-structure.less', @@ -32,7 +31,6 @@ class StyleSheet 'css/icinga/forms.less', 'css/icinga/setup.less', 'css/icinga/widgets.less', - 'css/icinga/pagination.less', 'css/icinga/selection-toolbar.less', 'css/icinga/login.less', 'css/icinga/controls.less', diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less index b80e7e2c2..aea9b11e5 100644 --- a/public/css/icinga/controls.less +++ b/public/css/icinga/controls.less @@ -1,5 +1,54 @@ /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ +.limiter-control > .control-group { + padding: 0; + + > .control-label-group { + text-align: left; + padding: 0; + width: 1em; + } + + > select { + width: 4.5em; + } + + > i { + .sr-only(); + } +} + +.pagination-control { + li { + &.active { + > a, + > a:hover { + border-bottom: 2px solid @icinga-blue; + color: @icinga-blue + } + > a:hover { + background: none; + cursor: default; + text-decoration: none; + } + } + + &.disabled { + color: @gray-light; + cursor: no-drop; + } + + > a, + > span { + padding: 0 0.5em 0.25em 0.5em; + } + > a:hover { + background-color: @gray-lighter; + text-decoration: none; + } + } +} + .sort-control { label { width: auto; diff --git a/public/css/icinga/limiter.less b/public/css/icinga/limiter.less deleted file mode 100644 index 06f21a927..000000000 --- a/public/css/icinga/limiter.less +++ /dev/null @@ -1,19 +0,0 @@ -/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ - -.limiter-control > .control-group { - padding: 0; - - > .control-label-group { - text-align: left; - padding: 0; - width: 1em; - } - - > select { - width: 4.5em; - } - - > i { - .sr-only(); - } -} diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less deleted file mode 100644 index 38087dd92..000000000 --- a/public/css/icinga/pagination.less +++ /dev/null @@ -1,32 +0,0 @@ -/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ - -.pagination-control { - li { - &.active { - > a, - > a:hover { - border-bottom: 2px solid @icinga-blue; - color: @icinga-blue - } - > a:hover { - background: none; - cursor: default; - text-decoration: none; - } - } - - &.disabled { - color: @gray-light; - cursor: no-drop; - } - - > a, - > span { - padding: 0 0.5em 0.25em 0.5em; - } - > a:hover { - background-color: @gray-lighter; - text-decoration: none; - } - } -}