IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

User metric badge alignment fix

Browse Source
This commit is contained in:
Kris
2018-05-23 18:46:25 -04:00
parent 232ed64865
commit 15f7d06108
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/templates/components/dashboard-inline-table.hbs
View File

@@ -7,7 +7,7 @@
<div class="table-container"> <div class="table-container">
{{#unless hasBlock}} {{#unless hasBlock}}
{{#each report.data as |data|}} {{#each report.data as |data|}}
<div class="table-cell user-{{data.key}}"> <a class="table-cell user-{{data.key}}" href="{{data.url}}">
<span class="label"> <span class="label">
{{#if data.icon}} {{#if data.icon}}
{{d-icon data.icon}} {{d-icon data.icon}}
@@ -15,13 +15,9 @@
{{data.x}} {{data.x}}
</span> </span>
<span class="value"> <span class="value">
{{#if data.url}}
<a href="{{data.url}}">{{number data.y}}</a>
{{else}}
{{number data.y}} {{number data.y}}
{{/if}}
</span> </span>
</div> </a>
{{/each}} {{/each}}
{{else}} {{else}}
{{yield (hash report=report)}} {{yield (hash report=report)}}

17
app/assets/stylesheets/common/admin/dashboard_next.scss
View File

@@ -380,30 +380,30 @@
flex: 1 0 auto; flex: 1 0 auto;
max-width: 95%; max-width: 95%;
} }
}
.table-cell { .table-cell {
display: flex; display: flex;
flex: 0 1 auto; flex: 0 1 auto;
margin: 0 1em .5em 0; margin: 0 10px 5px 0;
padding: 0 .5em 0 0;
border: 1px solid $primary-low; border: 1px solid $primary-low;
border-radius: 10px; border-radius: 10px;
.label { .label {
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: .25em;
color: $primary; color: $primary;
background: $primary-very-low; background: $primary-very-low;
padding: 0 .5em;
justify-content: center; justify-content: center;
border-radius: 10px 0 0 10px; border-radius: 9px 0 0 9px;
padding: 0 5px 0 8px;
.d-icon { .d-icon {
margin-right: 5px; margin-right: 5px;
font-size: $font-down-1; font-size: $font-down-1;
} }
} }
.value {
padding: 0 8px 0 5px;
}
&.user-newuser{ &.user-newuser{
.label { .label {
color: $primary-high; color: $primary-high;
@@ -434,6 +434,7 @@
} }
} }
} }
}
.dashboard-inline-table { .dashboard-inline-table {
margin-left: 5%; margin-left: 5%;