From 6b22776160de3e11881114fd71917dabe1e9c2bf Mon Sep 17 00:00:00 2001 From: riking Date: Wed, 13 Aug 2014 12:38:55 -0700 Subject: [PATCH 1/2] Style & structure fixes for mobile user page --- .../templates/user/user.js.handlebars | 3 ++- app/assets/stylesheets/mobile/user.scss | 20 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/user/user.js.handlebars b/app/assets/javascripts/discourse/templates/user/user.js.handlebars index b1cbe1abdf8..04b9bd4e283 100644 --- a/app/assets/javascripts/discourse/templates/user/user.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/user.js.handlebars @@ -66,8 +66,9 @@ {{#if number_of_flagged_posts}}
{{#link-to 'user.flaggedPosts' this}} - {{number_of_flagged_posts}} {{i18n user.staff_counters.flagged_posts}}
+ {{number_of_flagged_posts}} {{i18n user.staff_counters.flagged_posts}} {{/link-to}} + {{/if}} {{#if number_of_deleted_posts}}
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index 519288f21f0..77de38d4f58 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -147,16 +147,30 @@ img { max-width: 100%; } + + .primary-textual { + width: 90%; + margin: 0 auto; + padding: 4px; + background: rgba($primary, 0.3); + + h1, h2 { + margin: 7px; + } + } } .secondary { background-color: $primary; text-align: left; - padding: 0 10px; + padding: 1px 10px; dd { color: $secondary; margin: 0 0 7px 0; + a { + color: inherit; + } } dt { color: scale-color($primary, $lightness: 75%); @@ -274,8 +288,10 @@ .staff-counters { text-align: center; - > div { + div { + padding: 2px 8px; margin-bottom: 10px; + display: inline-block; } a.active { font-weight: bold; From 62ed597faadcf91a8bc525a6aa2f8bb32ef6f902 Mon Sep 17 00:00:00 2001 From: riking Date: Wed, 13 Aug 2014 12:43:27 -0700 Subject: [PATCH 2/2] Also put the shaded background on desktop --- app/assets/stylesheets/desktop/user.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index b323e9dd451..35f372a2797 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -203,6 +203,11 @@ h1, h2 {font-weight: bold;} + .primary-textual { + background: rgba($primary, 0.2); + padding: 3px; + } + .bio { color: dark-light-diff($secondary, $primary, 75%, 0%); text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px;