Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2015-04-21 14:21:01 +0300
committerdiosmosis <benaka@piwik.pro>2015-04-21 14:21:01 +0300
commit0d18fdfa9e3f628f0ba19b9b0bd8460dfde18340 (patch)
treef5f7442e89c208bd7054a49724c91f1ba963f2f7 /plugins
parentbb3418a53de8d2db693104611bbf231d2db446cf (diff)
Refs #7728, move a CSS override to right below the style it pertains to (so it is clearer why theme colors aren't used for this change).
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Morpheus/stylesheets/general/_jqueryUI.less4
-rw-r--r--plugins/Morpheus/stylesheets/ui/_components.less4
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Morpheus/stylesheets/general/_jqueryUI.less b/plugins/Morpheus/stylesheets/general/_jqueryUI.less
index 66b2384011..eeba83bab1 100644
--- a/plugins/Morpheus/stylesheets/general/_jqueryUI.less
+++ b/plugins/Morpheus/stylesheets/general/_jqueryUI.less
@@ -168,6 +168,10 @@ div.ui-state-highlight {
opacity: 1 !important;
}
+.ui-datepicker td .ui-state-active.ui-state-hover {
+ color: #fff !important;
+}
+
.ui-datepicker td .ui-state-hover, .ui-datepicker .ui-datepicker td.ui-datepicker-current-period a.ui-state-hover, .ui-datepicker td.ui-datepicker-week-end .ui-state-hover {
background: #e5e3e0 !important;
color: #000 !important;
diff --git a/plugins/Morpheus/stylesheets/ui/_components.less b/plugins/Morpheus/stylesheets/ui/_components.less
index e3287c8c48..e16b8b9775 100644
--- a/plugins/Morpheus/stylesheets/ui/_components.less
+++ b/plugins/Morpheus/stylesheets/ui/_components.less
@@ -39,10 +39,6 @@
background: @theme-color-text !important;
}
-.ui-datepicker td .ui-state-active.ui-state-hover {
- color: #fff !important;
-}
-
.ui-datepicker td.ui-datepicker-current-period a.ui-state-default, td .ui-state-active, .ui-datepicker td.ui-datepicker-current-period a.ui-state-active, .ui-datepicker td.ui-datepicker-week-end .ui-state-active, .ui-datepicker td.ui-datepicker-other-month.ui-datepicker-current-period {
background: @calendarCurrentStateHover;
}