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 Aubry <mattab@users.noreply.github.com>2016-09-30 05:31:46 +0300
committerGitHub <noreply@github.com>2016-09-30 05:31:46 +0300
commit977f8e27722c11c3514a4f19c3b035c952a85202 (patch)
tree67a2317c69d59199db34b20ed3f7b2e6e4e48469 /plugins
parent53d163237d6a9796c82bab3c696df87804f1c3e8 (diff)
Remove the "Segment editor was crowdfunded" link on hover, to keep things simpler (#10599)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Morpheus/stylesheets/general/_typography.less8
-rw-r--r--plugins/Morpheus/stylesheets/ui/_components.less3
-rw-r--r--plugins/SegmentEditor/javascripts/Segmentation.js10
-rw-r--r--plugins/SegmentEditor/stylesheets/segmentation.less17
-rw-r--r--plugins/SegmentEditor/templates/_segmentSelector.twig1
5 files changed, 0 insertions, 39 deletions
diff --git a/plugins/Morpheus/stylesheets/general/_typography.less b/plugins/Morpheus/stylesheets/general/_typography.less
index 66b2dddeb4..710174ddef 100644
--- a/plugins/Morpheus/stylesheets/general/_typography.less
+++ b/plugins/Morpheus/stylesheets/general/_typography.less
@@ -72,14 +72,6 @@ a {
color: @theme-color-link !important;
}
-.segmentFooterNote {
- margin-top: -3px;
- font-family: @theme-fontFamily-base !important;
- a {
- color: @theme-color-link !important;
- }
-}
-
body > a.ddmetric {
background-color: @color-gray-light !important;
border-color: @color-gray !important;
diff --git a/plugins/Morpheus/stylesheets/ui/_components.less b/plugins/Morpheus/stylesheets/ui/_components.less
index c8ff4a3e70..9116ef17f0 100644
--- a/plugins/Morpheus/stylesheets/ui/_components.less
+++ b/plugins/Morpheus/stylesheets/ui/_components.less
@@ -140,9 +140,6 @@
a.delete {
color: @theme-color-brand;
}
- .segmentFooterNote, .segment-element .segment-footer .segmentFooterNote a {
- color: @theme-color-text-light;
- }
}
}
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index 812daeb2e1..66a5e3480a 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -592,10 +592,6 @@ Segmentation = (function($) {
// segment editor form events
//
- self.target.on('click', ".segment-element a:not(.crowdfundingLink)", function (e) {
- e.preventDefault();
- });
-
self.target.on('click', "a.editSegmentName", function (e) {
var oldName = $(e.currentTarget).parents("h3").find("span").text();
$(e.currentTarget).parents("h3").find("span").hide();
@@ -1033,12 +1029,6 @@ Segmentation = (function($) {
parseFormAndSave();
});
- $(self.form).find('.segment-footer').hover( function() {
- $('.segmentFooterNote', self.target).fadeIn();
- }, function() {
- $('.segmentFooterNote', self.target).fadeOut();
- });
-
if(typeof mode !== "undefined" && mode == "new")
{
$(self.form).find(".editSegmentName").trigger('click');
diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less
index f10f067856..9b5dc195bc 100644
--- a/plugins/SegmentEditor/stylesheets/segmentation.less
+++ b/plugins/SegmentEditor/stylesheets/segmentation.less
@@ -5,23 +5,6 @@
}
-.segment-footer .segmentFooterNote {
- display: none;
- float: left;
- padding-top: 9px;
-}
-
-.segment-footer .segmentFooterNote, .segment-element .segment-footer .segmentFooterNote a {
- font-size: 8pt;
- color: #888172;
-}
-
-.segment-element .segment-footer .segmentFooterNote a {
- padding: 0;
- margin: 0;
- text-decoration: underline;
-}
-
.searchFound {
border: 0px solid red;
}
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig
index 4a8d35c9f3..02bd362947 100644
--- a/plugins/SegmentEditor/templates/_segmentSelector.twig
+++ b/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -156,7 +156,6 @@
</div>
<div class="segment-footer">
<div piwik-rate-feature title="Segment Editor" style="display:inline-block;float: left;margin-top: 2px;margin-right: 10px;"></div>
- <span class="segmentFooterNote">The Segment Editor was <a class='crowdfundingLink' href='http://crowdfunding.piwik.org/custom-segments-editor/' rel='noreferrer' target='_blank'>crowdfunded</a> with the awesome support of 80 companies and Piwik users worldwide!</span>
<a class="btn-flat delete" href="#">{{ 'General_Delete'|translate }}</a>
<a class="btn-flat close" href="#">{{ 'General_Close'|translate }}</a>
<button class="btn saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate }}</button>