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:
authorPeter Zhang <waikatozhang@gmail.com>2021-10-05 03:40:10 +0300
committerGitHub <noreply@github.com>2021-10-05 03:40:10 +0300
commitf48b6d52710bf25aeff0bf7724ecdd594ec6c3f1 (patch)
treea813ae19727ef67d7aadeb702f9c940fdf3b6401 /plugins/CoreHome/angularjs
parent2404b24c3a52f04475b63f300269a129399882ec (diff)
Icon for "Report generated X min ago" displayed for "Today" is too small (#18035)
* update icon and CSS update icon and CSS * remove time icon remove time icon * update related screenshots update related screenshots
Diffstat (limited to 'plugins/CoreHome/angularjs')
-rw-r--r--plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html6
-rw-r--r--plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js5
-rw-r--r--plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less19
3 files changed, 10 insertions, 20 deletions
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
index f5d673b589..4907525499 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
@@ -14,17 +14,15 @@
class="helpIcon"><span class="icon-help"></span></a>
<a ng-if="inlineHelp"
- title="{{ 'General_Help'|translate }}"
+ title="{{ (reportGenerated ? 'General_HelpReport' : 'General_Help' )|translate }}"
ng-click="view.showInlineHelp=!view.showInlineHelp"
- class="helpIcon" ng-class="{ 'active': view.showInlineHelp }"><span class="icon-help"></span></a>
+ class="helpIcon" ng-class="{ 'active': view.showInlineHelp }"><span class="icon-info"></span></a>
<div class="ratingIcons"
piwik-rate-feature
title="{{ featureName }}"></div>
</span>
- <div ng-show="showReportGenerated" class="icon-clock report-generated"></div>
-
<div class="inlineHelp" ng-show="view.showInlineHelp">
<div ng-bind-html="inlineHelp"></div>
<a ng-if="helpUrl"
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js
index 93afe6ed99..6280736cf7 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js
@@ -42,8 +42,6 @@
var defaults = {
helpUrl: '',
editUrl: '',
- reportGenerated: '',
- showReportGenerated: '',
};
return {
@@ -55,7 +53,6 @@
reportGenerated: '@?',
featureName: '@',
inlineHelp: '@?',
- showReportGenerated: '=?'
},
templateUrl: 'plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html?cb=' + piwik.cacheBuster,
compile: function (element, attrs) {
@@ -105,7 +102,7 @@
hide: false
});
- scope.showReportGenerated = '1';
+
}
};
}
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
index 17f7eec7c2..878372c857 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
@@ -20,7 +20,7 @@
}
.title {
- display:inline-block;
+ display: inline-block;
}
.inlineHelp {
@@ -40,6 +40,7 @@
font-weight: bold;
}
}
+
.iconsBar {
line-height: 1 !important;
}
@@ -53,22 +54,16 @@
cursor: pointer;
display: inline-block;
margin: 0 0 -1px 4px;
- opacity: 0.3;
- font-size: 15px;
+ opacity: 0.4;
+ font-size: 16px;
color: @theme-color-text-light !important;
+
&:hover, &.active {
color: @theme-color-help-background-color !important;
opacity: 0.9;
text-decoration: none;
}
}
-
- .report-generated {
- float: right;
- cursor: pointer;
- font-size: 14px;
- color:#888;
- opacity: 0.3;
- line-height: 32px;
- }
}
+
+