UX: display staged status on user summary page

This commit is contained in:
Régis Hanol 2018-04-20 17:42:06 +02:00
parent 76474f3156
commit b489edac1d
5 changed files with 17 additions and 14 deletions

View File

@ -86,6 +86,9 @@
<div class="primary-textual">
<h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
<h2 class="{{if nameFirst "username" "full-name"}}">{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
{{#if model.staged}}
<h2 class="staged">{{i18n 'user.staged'}}</h2>
{{/if}}
{{#if model.title}}
<h3>{{model.title}}</h3>
{{/if}}
@ -191,7 +194,7 @@
</dd>
</div>
{{/if}}
{{#if canDeleteUser}}
<div>{{d-button action="adminDelete" icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
{{/if}}

View File

@ -83,7 +83,7 @@
big { font-size: 2rem; }
small { font-size: 0.75rem; }
small small { font-size: .75em; }
big big { font-size: 1em; }
big big { font-size: 1em; }
sub sub sub {bottom: 0;}
sup sup sup {top: 0;}
}
@ -110,7 +110,7 @@
.clearfix > .topic-meta-data > .names {
span.user-title {
background-color: dark-light-choose($highlight-low, $highlight-medium);
color: dark-light-choose($primary-high, $secondary-low);
color: dark-light-choose($primary-high, $secondary-low);
padding-left: 4px;
padding-right: 4px;
}
@ -168,7 +168,6 @@ aside.quote {
opacity: 0.4;
}
.quote-controls {
float: right;
display: flex;
@ -204,7 +203,7 @@ aside.quote {
background: blend-primary-secondary(5%);
border: 1px solid $primary-low;
border-top: none; // would cause double top border
.avatars {
> div {
float: left;
@ -404,7 +403,7 @@ kbd
background: dark-light-choose(#fafafa, #333);
border: 1px solid dark-light-choose(#ccc, #555);
border-bottom: medium none dark-light-choose(#fff, #000);
color: $primary;
display: inline-block;
font-size: $font-down-1;
@ -469,7 +468,7 @@ blockquote > *:last-child {
max-width: 755px;
border-top: 1px solid $primary-low;
.topic-avatar {
align-self: flex-start;
align-self: flex-start;
padding: .7em 0;
border-top: none;
margin-right: 11px;
@ -490,7 +489,7 @@ blockquote > *:last-child {
}
.small-action-desc {
display: flex;
display: flex;
flex-wrap: wrap;
flex: 1 1 100%;
align-items: center;
@ -501,7 +500,7 @@ blockquote > *:last-child {
color: $primary-medium;
.custom-message {
flex: 1 1 100%;
flex: 1 1 100%;
text-transform: none;
font-weight: normal;
font-size: $font-up-1;

View File

@ -72,3 +72,8 @@
}
}
}
.primary-textual .staged,
#user-card .staged {
font-style: italic;
}

View File

@ -41,9 +41,6 @@ $user_card_background: $secondary;
a.card-huge-avatar {
outline: none;
}
.staged {
font-style: italic;
}
}
&.no-bg {
@ -182,7 +179,7 @@ $user_card_background: $secondary;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: $user_card_primary;
color: $user_card_primary;
}
.location {
margin-right: .5em;

View File

@ -79,7 +79,6 @@ margin-top: 10px;
.secondary {
dl {
padding: 5px 0;
}
}