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

Fixed heading weight issue

Browse source 
Moved colours to variables
This commit is contained in:
Phil Hughes 2016-03-02 10:34:25 +00:00
parent 9dc71dcaa0
commit 4d4573268e
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,12 @@ $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;
/*
* Color schema
*/
@ -98,8 +104,14 @@ $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;

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

@ -176,17 +176,17 @@
}
.change-username-title {
color: #FC6D26;
color: $change-username-title-color;
}
.remove-account-title {
color: #F00;
color: $remove-account-title-color;
}
.provider-btn-group {
display: inline-block;
margin-right: 10px;
border: 1px solid #E5E5E5;
border: 1px solid $provider-btn-group-border;
border-radius: 3px;
&:last-child {
@ -197,7 +197,7 @@
.provider-btn-image {
display: inline-block;
padding: 5px 10px;
border-right: 1px solid #E5E5E5;
border-right: 1px solid $provider-btn-group-border;
> img {
width: 20px;
@ -212,6 +212,6 @@
background-color: $gray-light;
&.not-active {
color: #4688F1;
color: $provider-btn-not-active-color;
}
}