Commit 573c89e624806750d6ad948f62d3ead9bdf6d121
1 parent
1935b494
Exists in
master
and in
4 other branches
Improve Profile#account page UI
Showing
3 changed files
with
40 additions
and
22 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -270,26 +270,6 @@ li.note { | @@ -270,26 +270,6 @@ li.note { | ||
| 270 | } | 270 | } |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | -.oauth_select_holder { | ||
| 274 | - img { | ||
| 275 | - padding: 5px; | ||
| 276 | - margin-right: 10px; | ||
| 277 | - } | ||
| 278 | - .active { | ||
| 279 | - img { | ||
| 280 | - border: 1px solid #ccc; | ||
| 281 | - background: $hover; | ||
| 282 | - @include border-radius(5px); | ||
| 283 | - } | ||
| 284 | - } | ||
| 285 | -} | ||
| 286 | - | ||
| 287 | -.btn-build-token { | ||
| 288 | - float: left; | ||
| 289 | - padding: 6px 20px; | ||
| 290 | - margin-right: 12px; | ||
| 291 | -} | ||
| 292 | - | ||
| 293 | .gitlab-promo { | 273 | .gitlab-promo { |
| 294 | a { | 274 | a { |
| 295 | color: #aaa; | 275 | color: #aaa; |
app/assets/stylesheets/sections/profile.scss
| @@ -4,3 +4,41 @@ | @@ -4,3 +4,41 @@ | ||
| 4 | margin-bottom: 0; | 4 | margin-bottom: 0; |
| 5 | } | 5 | } |
| 6 | } | 6 | } |
| 7 | + | ||
| 8 | +.account-page { | ||
| 9 | + fieldset { | ||
| 10 | + margin-bottom: 15px; | ||
| 11 | + border-bottom: 1px dashed #ddd; | ||
| 12 | + padding-bottom: 15px; | ||
| 13 | + | ||
| 14 | + &:last-child { | ||
| 15 | + border: none; | ||
| 16 | + } | ||
| 17 | + | ||
| 18 | + legend { | ||
| 19 | + border: none; | ||
| 20 | + margin: 0; | ||
| 21 | + } | ||
| 22 | + } | ||
| 23 | +} | ||
| 24 | + | ||
| 25 | +.oauth_select_holder { | ||
| 26 | + img { | ||
| 27 | + padding: 2px; | ||
| 28 | + margin-right: 10px; | ||
| 29 | + } | ||
| 30 | + .active { | ||
| 31 | + img { | ||
| 32 | + border: 1px solid #4BD; | ||
| 33 | + background: $hover; | ||
| 34 | + @include border-radius(5px); | ||
| 35 | + } | ||
| 36 | + } | ||
| 37 | +} | ||
| 38 | + | ||
| 39 | +.btn-build-token { | ||
| 40 | + float: left; | ||
| 41 | + padding: 6px 20px; | ||
| 42 | + margin-right: 12px; | ||
| 43 | +} | ||
| 44 | + |
app/views/profiles/accounts/show.html.haml
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | %hr | 7 | %hr |
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | -%div | 10 | +.account-page |
| 11 | %fieldset.update-token | 11 | %fieldset.update-token |
| 12 | %legend | 12 | %legend |
| 13 | Private token | 13 | Private token |
| @@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
| 33 | - if show_profile_social_tab? | 33 | - if show_profile_social_tab? |
| 34 | %fieldset | 34 | %fieldset |
| 35 | %legend Social Accounts | 35 | %legend Social Accounts |
| 36 | - .oauth_select_holder | 36 | + .oauth_select_holder.append-bottom-10 |
| 37 | %p Click on icon to activate signin with one of the following services | 37 | %p Click on icon to activate signin with one of the following services |
| 38 | - enabled_social_providers.each do |provider| | 38 | - enabled_social_providers.each do |provider| |
| 39 | %span{class: oauth_active_class(provider) } | 39 | %span{class: oauth_active_class(provider) } |