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:
-rw-r--r--plugins/CoreVisualizations/javascripts/jqplot.js2
-rw-r--r--plugins/Morpheus/stylesheets/popups.less7
-rw-r--r--plugins/Zeitgeist/stylesheets/general/_jqueryUI.less4
-rw-r--r--plugins/Zeitgeist/stylesheets/ui/_siteSelect.less3
4 files changed, 15 insertions, 1 deletions
diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js
index a894d1fa74..816bf1b2f2 100644
--- a/plugins/CoreVisualizations/javascripts/jqplot.js
+++ b/plugins/CoreVisualizations/javascripts/jqplot.js
@@ -622,6 +622,8 @@ RowEvolutionSeriesToggle.prototype.attachEvents = function () {
el.click(function (e) {
if (e.shiftKey) {
self.toggleSeries(i);
+
+ document.getSelection().removeAllRanges(); // make sure chrome doesn't select text
} else {
self.showSeries(i);
}
diff --git a/plugins/Morpheus/stylesheets/popups.less b/plugins/Morpheus/stylesheets/popups.less
index b5d84ff2cc..25057f435f 100644
--- a/plugins/Morpheus/stylesheets/popups.less
+++ b/plugins/Morpheus/stylesheets/popups.less
@@ -37,6 +37,13 @@
background: none !important;
}
}
+
+button.ui-state-default, .ui-widget-content button.ui-state-default, .ui-widget-header button.ui-state-default {
+ &:hover {
+ background: @brand-red !important;
+ }
+}
+
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
border: 0px !important;
}
diff --git a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
index 172f13f208..3dd46a1cff 100644
--- a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
+++ b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
@@ -228,4 +228,8 @@ body .ui-tooltip.small {
height: 16px;
background: url(plugins/Zeitgeist/images/help.png);
overflow: hidden;
+}
+
+.ui-dialog ~ .ui-dialog {
+ border: 1px solid #aaa;
} \ No newline at end of file
diff --git a/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less b/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less
index 29c2bd1fd8..0dd6d9dea0 100644
--- a/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less
+++ b/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less
@@ -39,7 +39,7 @@
border-radius: 4px;
cursor: pointer;
min-width: 165px;
- padding: 5px 6px 5px;
+ padding: 5px 6px 4px;
}
.sites_autocomplete .custom_select_main_link {
@@ -47,6 +47,7 @@
text-decoration: none;
background: none;
cursor: default;
+ height:1.4em;
}
.sites_autocomplete .custom_select_ul_list li a,