From e6ab59a207b7d6626b5850435792c583be1d3120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?= Date: Sun, 17 Sep 2017 17:34:40 +0200 Subject: [PATCH] Cleanup search and datetimepicker scss files --- css/src/08search.scss | 26 +++--- css/src/09datetimepicker.scss | 126 +++++++++++++++------------- css/style.scss | 152 ++++++++++++++++++---------------- 3 files changed, 164 insertions(+), 140 deletions(-) diff --git a/css/src/08search.scss b/css/src/08search.scss index a5b3263d..eb5b68e3 100644 --- a/css/src/08search.scss +++ b/css/src/08search.scss @@ -8,20 +8,20 @@ background-color: transparent !important; min-height: 150px; - #status { - padding: 10px 0 18px !important; - height: 22px !important; - background-color: transparent !important; - font-weight: bold; - color: $gray; - font-size: 13px !important; - - &.emptycontent { - position: relative; - } - } - span.icon.task-checkbox { opacity: .6; } } + +#status { + padding: 10px 0 18px !important; + height: 22px !important; + background-color: transparent !important; + font-weight: bold; + color: $gray; + font-size: 13px !important; + + &.emptycontent { + position: relative; + } +} diff --git a/css/src/09datetimepicker.scss b/css/src/09datetimepicker.scss index 1efc548e..926a4ac4 100644 --- a/css/src/09datetimepicker.scss +++ b/css/src/09datetimepicker.scss @@ -1,5 +1,5 @@ /** - * rules for datetimepicker + * rules for date- and timepicker */ .ui-widget-content { @@ -13,6 +13,10 @@ border: none; } +/** + * rules for both date- and timepicker + */ + .ui-timepicker, .ui-datepicker { width: 185px; @@ -31,6 +35,15 @@ td { width: 14%; padding: 0; + + &.selected a, + a.ui-state-active { + background: linear-gradient(to top, rgba($blue_background, .8), rgba($blue_background, .6)) repeat scroll 0 0 transparent !important; + border-radius: 3px; + color: $white !important; + opacity: 1; + position: relative; + } } thead th { @@ -71,62 +84,6 @@ } } -.ui-datepicker table td.selected a, -.ui-timepicker table td a.ui-state-active { - background: linear-gradient(to top, rgba($blue_background, .8), rgba($blue_background, .6)) repeat scroll 0 0 transparent !important; - border-radius: 3px; - color: $white !important; - opacity: 1; - position: relative; -} - -.ui-timepicker { - .ui-timepicker-title { - text-align: center; - } -} - -.ui-datepicker { - table { - td { - &.ui-datepicker-today a { - color: $blue_background; - } - } - } - - .ui-datepicker-next, - .ui-datepicker-next-hover { - right: 2px; - top: 2px; - background: none; - border: none; - } - - .ui-datepicker-prev, - .ui-datepicker-prev-hover { - left: 2px; - top: 2px; - background: none; - border: none; - } - - .ui-icon { - @extend .icon; - - height: 16px; - width: 16px; - } - - .ui-icon-circle-triangle-w { - @extend .icon-sort-up; - } - - .ui-icon-circle-triangle-e { - @extend .icon-sort-down; - } -} - div { &.ui-datepicker, &.ui-timepicker { @@ -179,6 +136,61 @@ div { } } +/** + * rules for timepicker + */ + +.ui-timepicker { + .ui-timepicker-title { + text-align: center; + } +} + td.ui-timepicker-hours table { border-right: 1px solid $gray_light; } + +/** + * rules for datepicker + */ + +.ui-datepicker { + table { + td { + &.ui-datepicker-today a { + color: $blue_background; + } + } + } + + .ui-datepicker-next, + .ui-datepicker-next-hover { + right: 2px; + top: 2px; + background: none; + border: none; + } + + .ui-datepicker-prev, + .ui-datepicker-prev-hover { + left: 2px; + top: 2px; + background: none; + border: none; + } + + .ui-icon { + @extend .icon; + + height: 16px; + width: 16px; + } + + .ui-icon-circle-triangle-w { + @extend .icon-sort-up; + } + + .ui-icon-circle-triangle-e { + @extend .icon-sort-down; + } +} diff --git a/css/style.scss b/css/style.scss index 29c5bf18..f80e7501 100644 --- a/css/style.scss +++ b/css/style.scss @@ -1425,26 +1425,26 @@ a { background-color: transparent !important; min-height: 150px; - #status { - padding: 10px 0 18px !important; - height: 22px !important; - background-color: transparent !important; - font-weight: bold; - color: $gray; - font-size: 13px !important; - - &.emptycontent { - position: relative; - } - } - span.icon.task-checkbox { opacity: .6; } } +#status { + padding: 10px 0 18px !important; + height: 22px !important; + background-color: transparent !important; + font-weight: bold; + color: $gray; + font-size: 13px !important; + + &.emptycontent { + position: relative; + } +} + /** - * rules for datetimepicker + * rules for date- and timepicker */ .ui-widget-content { @@ -1458,6 +1458,10 @@ a { border: none; } +/** + * rules for both date- and timepicker + */ + .ui-timepicker, .ui-datepicker { width: 185px; @@ -1476,6 +1480,15 @@ a { td { width: 14%; padding: 0; + + &.selected a, + a.ui-state-active { + background: linear-gradient(to top, rgba($blue_background, .8), rgba($blue_background, .6)) repeat scroll 0 0 transparent !important; + border-radius: 3px; + color: $white !important; + opacity: 1; + position: relative; + } } thead th { @@ -1516,62 +1529,6 @@ a { } } -.ui-datepicker table td.selected a, -.ui-timepicker table td a.ui-state-active { - background: linear-gradient(to top, rgba($blue_background, .8), rgba($blue_background, .6)) repeat scroll 0 0 transparent !important; - border-radius: 3px; - color: $white !important; - opacity: 1; - position: relative; -} - -.ui-timepicker { - .ui-timepicker-title { - text-align: center; - } -} - -.ui-datepicker { - table { - td { - &.ui-datepicker-today a { - color: $blue_background; - } - } - } - - .ui-datepicker-next, - .ui-datepicker-next-hover { - right: 2px; - top: 2px; - background: none; - border: none; - } - - .ui-datepicker-prev, - .ui-datepicker-prev-hover { - left: 2px; - top: 2px; - background: none; - border: none; - } - - .ui-icon { - @extend .icon; - - height: 16px; - width: 16px; - } - - .ui-icon-circle-triangle-w { - @extend .icon-sort-up; - } - - .ui-icon-circle-triangle-e { - @extend .icon-sort-down; - } -} - div { &.ui-datepicker, &.ui-timepicker { @@ -1624,10 +1581,65 @@ div { } } +/** + * rules for timepicker + */ + +.ui-timepicker { + .ui-timepicker-title { + text-align: center; + } +} + td.ui-timepicker-hours table { border-right: 1px solid $gray_light; } +/** + * rules for datepicker + */ + +.ui-datepicker { + table { + td { + &.ui-datepicker-today a { + color: $blue_background; + } + } + } + + .ui-datepicker-next, + .ui-datepicker-next-hover { + right: 2px; + top: 2px; + background: none; + border: none; + } + + .ui-datepicker-prev, + .ui-datepicker-prev-hover { + left: 2px; + top: 2px; + background: none; + border: none; + } + + .ui-icon { + @extend .icon; + + height: 16px; + width: 16px; + } + + .ui-icon-circle-triangle-w { + @extend .icon-sort-up; + } + + .ui-icon-circle-triangle-e { + @extend .icon-sort-down; + } +} + /** * rules for sortorder-dropdown */