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:
authorMatthieu Napoli <matthieu@mnapoli.fr>2015-05-03 02:00:36 +0300
committerMatthieu Napoli <matthieu@mnapoli.fr>2015-06-01 23:05:31 +0300
commit7fbd5015a6fcf48eed110533af09de08752b8c1b (patch)
treee86247e292ecd05263179d85cef3b1ca5b575f07 /plugins/SegmentEditor
parent00c527409a527006a1a784efb4a92f55593e860e (diff)
ref #7585 Refactored the less rules for buttons to simplify them
Removed most of the `!important` tags which allows to override the design of buttons (e.g. `btn-lg`, etc.)
Diffstat (limited to 'plugins/SegmentEditor')
-rw-r--r--plugins/SegmentEditor/stylesheets/segmentation.less30
-rw-r--r--plugins/SegmentEditor/templates/_segmentSelector.twig2
2 files changed, 4 insertions, 28 deletions
diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less
index d09c4a4573..42dbe76fc1 100644
--- a/plugins/SegmentEditor/stylesheets/segmentation.less
+++ b/plugins/SegmentEditor/stylesheets/segmentation.less
@@ -98,11 +98,11 @@ div.scrollable {
.segment-element .custom_select_search input[type="text"] {
font: 11px Arial;
- color: #454545;
+ color: #454545 !important;
width: 125px;
- padding: 4px 0 3px 7px;
+ padding: 4px 0 3px 7px !important;
border: none;
- background: none;
+ background: none !important;
}
.segment-element .custom_select_search a {
@@ -415,18 +415,6 @@ div.scrollable {
}
.segment-element .segment-footer button {
- min-width: 178px;
- height: 30px;
- background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDE3OCAzMCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PGxpbmVhckdyYWRpZW50IGlkPSJoYXQwIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjUwJSIgeTE9IjEwMCUiIHgyPSI1MCUiIHkyPSItMS40MjEwODU0NzE1MjAyZS0xNCUiPgo8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjODM3OTZiIiBzdG9wLW9wYWNpdHk9IjEiLz4KPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjYWJhMzkzIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgPC9saW5lYXJHcmFkaWVudD4KCjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxNzgiIGhlaWdodD0iMzAiIGZpbGw9InVybCgjaGF0MCkiIC8+Cjwvc3ZnPg==);
- background-image: -moz-linear-gradient(bottom, #83796b 0%, #aba393 100%);
- background-image: -o-linear-gradient(bottom, #83796b 0%, #aba393 100%);
- background-image: -webkit-linear-gradient(bottom, #83796b 0%, #aba393 100%);
- background-image: linear-gradient(bottom, #83796b 0%, #aba393 100%);
- color: #fff;
- font-size: 16px;
- font-weight: bold;
- border-radius: 4px 4px 4px 4px;
- border: none;
margin: 0 0 0 15px;
}
@@ -550,13 +538,9 @@ div.scrollable {
}
.segmentEditorPanel.visible .add_new_segment {
- display: block;
- border: 0 none;
clear: both;
float: right;
margin: 12px 0 10px;
- text-decoration: none;
- width: 130px;
}
.segmentationContainer > ul.submenu > li {
@@ -573,10 +557,6 @@ span.segmentationTitle {
cursor: pointer;
}
-.add_new_segment {
- display: none;
-}
-
.segmentList {
max-height:300px;
margin-top: 5px;
@@ -684,10 +664,6 @@ a.metric_category {
.segmentEditorPanel.visible .segmentationContainer {
width: auto;
}
-
- .segmentEditorPanel.visible .add_new_segment {
- float: left;
- }
}
.dropdown-body {
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig
index a3a8ee90ae..d9d9f3fb9d 100644
--- a/plugins/SegmentEditor/templates/_segmentSelector.twig
+++ b/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -16,7 +16,7 @@
</ul>
{% if authorizedToCreateSegments %}
- <a class="add_new_segment">{{ 'SegmentEditor_AddNewSegment'|translate }}</a>
+ <a class="add_new_segment btn">{{ 'SegmentEditor_AddNewSegment'|translate }}</a>
{% else %}
<ul class="submenu">
<li>