Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-05 13:26:55 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-05 13:26:55 +0400
commitf6d96d354c9413ddb1a82c51a379653e18515297 (patch)
treeb2fc6d0abde383f2bd66a2e3ce5ef5a78e3daa44 /app
parent41d67d14214379d19a5fc2abfc4db2d73221b23a (diff)
Improve avatar block UI on profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/sections/profile.scss7
-rw-r--r--app/views/profiles/show.html.haml9
2 files changed, 9 insertions, 7 deletions
diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss
index 068e8994cb1..7e5668ae8a7 100644
--- a/app/assets/stylesheets/sections/profile.scss
+++ b/app/assets/stylesheets/sections/profile.scss
@@ -42,7 +42,8 @@
margin-right: 12px;
}
-.remove_avatar {
- margin-top: 10px;
+.profile-avatar-form-option {
+ hr {
+ margin: 10px 0;
+ }
}
-
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 69fc7b62c5d..d0c46ca6aff 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -74,9 +74,10 @@
&nbsp;
%span.file_name.js-avatar-filename File name...
= f.file_field :avatar, class: "js-user-avatar-input hide"
- %span.help-block The maximum file size allowed is 100KB.
- - if @user.avatar?
- = link_to 'Remove avatar', profile_avatar_path, confirm: "Avatar will be removed. Are you sure?", method: :delete, class: "btn btn-remove remove_avatar"
+ .light The maximum file size allowed is 100KB.
+ - if @user.avatar?
+ %hr
+ = link_to 'Remove avatar', profile_avatar_path, confirm: "Avatar will be removed. Are you sure?", method: :delete, class: "btn btn-remove btn-small remove-avatar"
.form-actions
- = f.submit 'Save changes', class: "btn btn-save" \ No newline at end of file
+ = f.submit 'Save changes', class: "btn btn-save"