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

fix margin if content is empty

This commit is contained in:
pixeldesu 2014-12-26 13:48:20 +01:00
parent e900b794d3
commit 40dc6a140d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,4 +58,8 @@
border-bottom: 2px solid $brand-danger; border-bottom: 2px solid $brand-danger;
background-color: #fff; background-color: #fff;
text-transform: uppercase; text-transform: uppercase;
}
.profile--follow-btn {
margin-top: 5px;
} }

6
app/views/user/_actions.html.haml
View File

@ -1,11 +1,11 @@
- if user_signed_in? - if user_signed_in?
- type ||= :nil - type ||= :nil
- if user == current_user - if user == current_user
%a.btn.btn-default.btn-block{href: edit_user_profile_path} Edit profile %a.btn.btn-default.btn-block.profile--follow-btn{href: edit_user_profile_path} Edit profile
- else - else
- if current_user.following? user - if current_user.following? user
%button#editprofile.btn.btn-default.btn-block{type: :button, name: 'user-action', data: { action: :unfollow, type: type, target: user.screen_name }} %button#editprofile.btn.btn-default.btn-block.profile--follow-btn{type: :button, name: 'user-action', data: { action: :unfollow, type: type, target: user.screen_name }}
Unfollow Unfollow
- else - else
%button#editprofile.btn.btn-primary.btn-block{type: :button, name: 'user-action', data: { action: :follow, type: type, target: user.screen_name }} %button#editprofile.btn.btn-primary.btn-block.profile--follow-btn{type: :button, name: 'user-action', data: { action: :follow, type: type, target: user.screen_name }}
Follow Follow