diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss index 896a8f4b..1c04aa9b 100644 --- a/app/assets/stylesheets/scss/user.scss +++ b/app/assets/stylesheets/scss/user.scss @@ -58,4 +58,8 @@ border-bottom: 2px solid $brand-danger; background-color: #fff; text-transform: uppercase; +} + +.profile--follow-btn { + margin-top: 5px; } \ No newline at end of file diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml index 7a6b277d..730c1e1d 100644 --- a/app/views/user/_actions.html.haml +++ b/app/views/user/_actions.html.haml @@ -1,11 +1,11 @@ - if user_signed_in? - type ||= :nil - 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 - 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 - 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 \ No newline at end of file