diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-03 08:40:57 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-03 08:40:57 +0000 |
| commit | 29169696a2c5b3239b1a9ac8b9f048a3909a8a3c (patch) | |
| tree | c2b73b83819cd5eb6b672107aeb9dfdd7e35ea43 | |
| parent | 7ea4948df76b0e822c7da93036b976c5bf22bfea (diff) | |
| download | gitlab-ce-email-settings.tar.gz | |
Removed page specific variablesemail-settings
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 20babdd1d76..0586bab68ec 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -93,9 +93,8 @@ $border-red-light: #E52C5A; $border-red-normal: #D22852; $border-red-dark: #CA264F; -$account-well-bg: #FAFAFA; -$account-well-border: #E5E5E5; -$account-well-radius: 3px; +$help-well-bg: #FAFAFA; +$help-well-border: #E5E5E5; /* header */ $light-grey-header: #faf9f9; diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 98647a8d4f0..726dcbb36a9 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -57,9 +57,9 @@ .account-well { padding: 10px 10px; - background-color: $account-well-bg; - border: 1px solid $account-well-border; - border-radius: $account-well-radius; + background-color: $help-well-bg; + border: 1px solid $help-well-border; + border-radius: $border-radius-base; ul { padding-left: 20px; |