diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-04 09:03:50 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-11 09:51:07 +0000 |
| commit | c9b62662cc569af613b94e41c6d8de503eb2749a (patch) | |
| tree | cb44696a5c89e0223d424ab90593bffc63082c9a | |
| parent | a9d97838a399f153a23c7a9a9656a3a0ed912dcc (diff) | |
| download | gitlab-ce-account-settings.tar.gz | |
Used standard variable coloursaccount-settings
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 8 |
2 files changed, 4 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index d55d5cfbca5..835364b2990 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -34,16 +34,12 @@ $error-exclamation-point: #E62958; $border-radius-default: 3px; $list-title-color: #333333; $list-text-color: #555555; -$profile-settings-link-color: $md-link-color; $btn-transparent-color: #8F8F8F; $ssh-key-icon-color: #8F8F8F; $ssh-key-icon-size: 18px; -$change-username-title-color: #FC6D26; -$remove-account-title-color: #F00; - $provider-btn-group-border: #E5E5E5; $provider-btn-not-active-color: #4688F1; @@ -104,14 +100,8 @@ $border-red-light: #F24F41; $border-red-normal: #D22852; $border-red-dark: #CA264F; -<<<<<<< 454832ace49f1b1742b380441817663051ba8ac8 $help-well-bg: #FAFAFA; $help-well-border: #E5E5E5; -======= -$account-well-bg: #FAFAFA; -$account-well-border: #E5E5E5; -$account-well-radius: 3px; ->>>>>>> Fixed heading weight issue /* header */ $light-grey-header: #faf9f9; diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 40037c548f3..248c56e459d 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -19,7 +19,7 @@ .account-btn-link, .profile-settings-sidebar a { - color: $profile-settings-link-color; + color: $md-link-color; } .oauth-buttons { @@ -171,16 +171,16 @@ .profile-settings-content { a { - color: $profile-settings-link-color; + color: $md-link-color; } } .change-username-title { - color: $change-username-title-color; + color: $gl-warning; } .remove-account-title { - color: $remove-account-title-color; + color: $gl-danger; } .provider-btn-group { |