FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes (whoops used current_user instead of user)

This commit is contained in:
Yuki 2015-05-08 21:34:58 +05:30
parent 975909f197
commit 9633511859
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/scss/user.scss
View File

@ -36,6 +36,10 @@
background-color: darken($navbar-inverse-bg, 10%); background-color: darken($navbar-inverse-bg, 10%);
} }
#profile--header.profile--no-header {
position: absolute;
}
.profile--panel .panel-heading { .profile--panel .panel-heading {
color: $brand-primary; color: $brand-primary;
border-bottom: 2px solid $brand-primary; border-bottom: 2px solid $brand-primary;
@ -99,7 +103,7 @@ $colours: danger $brand-danger,
text-decoration: line-through !important; text-decoration: line-through !important;
} }
.profile--panel-push-inner { .profile--panel-push-inner:not(.profile--no-header) {
display: block; display: block;
height: 60px; height: 60px;
} }
@ -111,7 +115,7 @@ $colours: danger $brand-danger,
} }
@media(min-width: 767px) { @media(min-width: 767px) {
.container.headerable { .container.headerable:not(.profile--no-header) {
padding-top: 0; padding-top: 0;
margin-top: -30px; margin-top: -30px;
} }

9
app/views/user/show.html.haml
View File

@ -1,12 +1,11 @@
#profile--header.hidden-xs #profile--header.hidden-xs{class: unless @user.profile_header.exists? then "profile--no-header" end}
%img.profile--header-img{src: current_user.profile_header.url(:web)} %img.profile--header-img{src: @user.profile_header.url(:web)}
#profile--panel-push-n.hidden-xs .container.j2-page.headerable{class: unless @user.profile_header.exists? then "profile--no-header" end}
.container.j2-page.headerable
.col-md-3.col-xs-12.col-sm-4.j2-col-reset .col-md-3.col-xs-12.col-sm-4.j2-col-reset
= render 'user/profile_info' = render 'user/profile_info'
.hidden-xs= render 'shared/links' .hidden-xs= render 'shared/links'
.col-md-9.col-xs-12.col-sm-8.j2-col-reset .col-md-9.col-xs-12.col-sm-8.j2-col-reset
.profile--panel-push-inner.hidden-xs .profile--panel-push-inner.hidden-xs{class: unless @user.profile_header.exists? then "profile--no-header" end}
= render 'shared/questionbox' = render 'shared/questionbox'
- unless @user.banned? - unless @user.banned?
#answers #answers