kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Used standard variable colours

Browse source
This commit is contained in:
Phil Hughes 2016-03-04 09:03:50 +00:00
parent a9d97838a3
commit c9b62662cc
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/framework/variables.scss
View file

@ -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;

8
app/assets/stylesheets/pages/profile.scss
View file

@ -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 {