diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-02 09:15:06 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-04 09:06:49 +0000 |
| commit | b03df1758bfa592c0bb6804f1f6bf540b792f3e9 (patch) | |
| tree | 2802cde0172cb76d135cb38454f68a73f9f90b4a | |
| parent | be390cff65de0bf6f0fc1f059c4243fcb85d43d0 (diff) | |
| download | gitlab-ce-b03df1758bfa592c0bb6804f1f6bf540b792f3e9.tar.gz | |
Moved scss values into variables
Fixed heading weight
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 8 | ||||
| -rw-r--r-- | app/views/profiles/applications.html.haml | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 6fc62f7f201..5ab40f14300 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -101,6 +101,11 @@ $border-red-dark: #CA264F; $help-well-bg: #FAFAFA; $help-well-border: #E5E5E5; +$settings-message-bg: #FBF2D9; +$settings-message-color: #9E8E60; +$settings-message-border: #F0E2BB; +$settings-message-radius: 3px; + /* header */ $light-grey-header: #faf9f9; diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index a3fc127e405..efb592b1c04 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -178,10 +178,10 @@ .profile-settings-message { line-height: 32px; - color: #9E8E60; - background-color: #FBF2D9; - border: 1px solid #F0E2BB; - border-radius: 3px; + color: $settings-message-color; + background-color: $settings-message-bg; + border: 1px solid $settings-message-border; + border-radius: $settings-message-radius; } .oauth-applications { diff --git a/app/views/profiles/applications.html.haml b/app/views/profiles/applications.html.haml index 911ba9f87f0..e072c18beb4 100644 --- a/app/views/profiles/applications.html.haml +++ b/app/views/profiles/applications.html.haml @@ -13,7 +13,7 @@ Manage applications that you've authorized to use your account. .col-lg-9 - if user_oauth_applications? - %h5 + %h5.prepend-top-0 Add new application = render 'doorkeeper/applications/form', application: @application %hr @@ -23,7 +23,7 @@ Your applications (#{@applications.size}) - if @applications.any? .table-responsive - %table.table.table-striped + %table.table %thead %tr %th Name @@ -47,7 +47,7 @@ - else .profile-settings-message.text-center You don't have any applications - .oauth-authorized-applications.prepend-top-20 + .oauth-authorized-applications.prepend-top-20.append-bottom-default - if user_oauth_applications? %h5 Authorized applications (#{@authorized_tokens.size}) |