Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2648 from riking/mobile-user-page 

Style & structure fixes for mobile user page
This commit is contained in:
Robin Ward 2014-08-13 15:48:17 -04:00
parent 22de2edae7 62ed597faa
commit 80f0e637ba
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/templates/user/user.js.handlebars
View File

@ -66,8 +66,9 @@
{{#if number_of_flagged_posts}} {{#if number_of_flagged_posts}}
<div> <div>
{{#link-to 'user.flaggedPosts' this}} {{#link-to 'user.flaggedPosts' this}}
<span class="pill flagged-posts">{{number_of_flagged_posts}}</span>&nbsp;{{i18n user.staff_counters.flagged_posts}}</div> <span class="pill flagged-posts">{{number_of_flagged_posts}}</span>&nbsp;{{i18n user.staff_counters.flagged_posts}}
{{/link-to}} {{/link-to}}
</div>
{{/if}} {{/if}}
{{#if number_of_deleted_posts}} {{#if number_of_deleted_posts}}
<div> <div>

5
app/assets/stylesheets/desktop/user.scss
View File

@ -203,6 +203,11 @@
h1, h2 {font-weight: bold;} h1, h2 {font-weight: bold;}
.primary-textual {
background: rgba($primary, 0.2);
padding: 3px;
}
.bio { .bio {
color: dark-light-diff($secondary, $primary, 75%, 0%); color: dark-light-diff($secondary, $primary, 75%, 0%);
text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px; text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px;

20
app/assets/stylesheets/mobile/user.scss
View File

@ -147,16 +147,30 @@
img { img {
max-width: 100%; max-width: 100%;
} }
.primary-textual {
width: 90%;
margin: 0 auto;
padding: 4px;
background: rgba($primary, 0.3);
h1, h2 {
margin: 7px;
}
}
} }
.secondary { .secondary {
background-color: $primary; background-color: $primary;
text-align: left; text-align: left;
padding: 0 10px; padding: 1px 10px;
dd { dd {
color: $secondary; color: $secondary;
margin: 0 0 7px 0; margin: 0 0 7px 0;
a {
color: inherit;
}
} }
dt { dt {
color: scale-color($primary, $lightness: 75%); color: scale-color($primary, $lightness: 75%);
@ -274,8 +288,10 @@
.staff-counters { .staff-counters {
text-align: center; text-align: center;
> div { div {
padding: 2px 8px;
margin-bottom: 10px; margin-bottom: 10px;
display: inline-block;
} }
a.active { a.active {
font-weight: bold; font-weight: bold;