Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the "Segment editor was crowdfunded" link on hover, to keep things simpler #10599

Merged
merged 1 commit into from Sep 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions plugins/Morpheus/stylesheets/general/_typography.less
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions plugins/Morpheus/stylesheets/ui/_components.less
Expand Up @@ -140,9 +140,6 @@
a.delete {
color: @theme-color-brand;
}
.segmentFooterNote, .segment-element .segment-footer .segmentFooterNote a {
color: @theme-color-text-light;
}
}
}

Expand Down
10 changes: 0 additions & 10 deletions plugins/SegmentEditor/javascripts/Segmentation.js
Expand Up @@ -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();
Expand Down Expand Up @@ -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');
Expand Down
17 changes: 0 additions & 17 deletions plugins/SegmentEditor/stylesheets/segmentation.less
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion plugins/SegmentEditor/templates/_segmentSelector.twig
Expand Up @@ -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>
Expand Down