diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 09e41badad3..177a8fec056 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -86,6 +86,9 @@
{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}
{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}
+ {{#if model.staged}}
+ {{i18n 'user.staged'}}
+ {{/if}}
{{#if model.title}}
{{model.title}}
{{/if}}
@@ -191,7 +194,7 @@
{{/if}}
-
+
{{#if canDeleteUser}}
{{d-button action="adminDelete" icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}
{{/if}}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 1ca8df22684..ea71beeea01 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -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;
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index 497c5f94392..1ab4eeab868 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -72,3 +72,8 @@
}
}
}
+
+.primary-textual .staged,
+#user-card .staged {
+ font-style: italic;
+}
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index ef4f05868bf..1589b94a220 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -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;
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index a8cd147c22f..561e682ffb1 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -79,7 +79,6 @@ margin-top: 10px;
.secondary {
dl {
padding: 5px 0;
-
}
}