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.

Sign up for GitHub

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

Jump to bottom

Fix for misaligned evolution trend icons #18323

Merged
merged 2 commits into from Nov 16, 2021
Merged

Fix for misaligned evolution trend icons #18323

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb9e26c
Aligned evolution trend icons, text tweak
bx80 Nov 16, 2021
699057a
Update plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
sgiehl Nov 16, 2021
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
4 changes: 4 additions & 0 deletions plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
View file
Open in desktop
Expand Up @@ -277,6 +277,10 @@
border-bottom: 5px solid @theme-color-brand;
}

.multisites_icon {
display:inline-block;vertical-align:middle;
bx80 marked this conversation as resolved.
Show resolved Hide resolved
}

div.sparkline {
float:none;
}
Expand Down
6 changes: 3 additions & 3 deletions plugins/MultiSites/angularjs/site/site.directive.html
View file
Open in desktop
Expand Up @@ -22,9 +22,9 @@

<td ng-if="period != 'range'" class="multisites-evolution" title="{{ website.tooltip }}">
<div class="visits value" ng-if="!website.isGroup">
<span ng-show="website[evolutionMetric+'_trend'] == 1"><img src="plugins/MultiSites/images/arrow_up.png" alt="" /> <span style="color: green;">{{ website[evolutionMetric] }}</span></span>
<span ng-show="website[evolutionMetric+'_trend'] == 0"><img src="plugins/MultiSites/images/stop.png" alt="" /> <span>{{ website[evolutionMetric] }}</span></span>
<span ng-show="website[evolutionMetric+'_trend'] == -1"><img src="plugins/MultiSites/images/arrow_down.png" alt="" /> <span style="color: red;">{{ website[evolutionMetric] }}</span></span>
<span ng-show="website[evolutionMetric+'_trend'] == 1"><img class="multisites_icon" src="plugins/MultiSites/images/arrow_up.png" alt="" /> <span style="color: green;">{{ website[evolutionMetric] }}</span></span>
<span ng-show="website[evolutionMetric+'_trend'] == 0"><img class="multisites_icon" src="plugins/MultiSites/images/stop.png" alt="" /> <span>{{ website[evolutionMetric] }}</span></span>
<span ng-show="website[evolutionMetric+'_trend'] == -1"><img class="multisites_icon" src="plugins/MultiSites/images/arrow_down.png" alt="" /> <span style="color: red;">{{ website[evolutionMetric] }}</span></span>
</div>
</td>

Expand Down
10 changes: 4 additions & 6 deletions plugins/MultiSites/lang/en.json
View file
Open in desktop
Expand Up @@ -8,11 +8,9 @@
"AllWebsitesDashboardDocumentation": "This report gives you an informational overview for each of your websites, containing the most general metrics about your visitors.",
"EvolutionComparisonIncomplete": "The currently selected time period is %1$s complete.",
"EvolutionComparisonProportional": "When the previous period was also %1$s complete, there would have been an estimated %2$s %3$s\n (out of a total of %4$s %3$s in the previous period).",
"EvolutionComparisonDay": "%1$s %2$s this day compared to %3$s %2$s in the previous period (%4$s) Evolution: %5$s",
"EvolutionComparisonWeek": "%1$s %2$s this week compared to %3$s %2$s in the previous period (%4$s) Evolution: %5$s",
"EvolutionComparisonMonth": "%1$s %2$s this month compared to %3$s %2$s in the previous period (%4$s) Evolution: %5$s",
"EvolutionComparisonYear": "%1$s %2$s this year compared to %3$s %2$s in the previous period (%4$s) Evolution: %5$s"


"EvolutionComparisonDay": "%1$s %2$s this day compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s",
"EvolutionComparisonWeek": "%1$s %2$s this week compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s",
"EvolutionComparisonMonth": "%1$s %2$s this month compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s",
"EvolutionComparisonYear": "%1$s %2$s this year compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s"
}
}