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

SCSS colors into variables

Browse source
This commit is contained in:
Phil Hughes 2016-04-04 11:00:29 +01:00
parent f62d7d261b
commit 51df93607f
5 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,3 +217,9 @@ $notes-light-color: #8e8e8e;
$notes-action-color: #c3c3c3; $notes-action-color: #c3c3c3;
$notes-role-color: #8e8e8e; $notes-role-color: #8e8e8e;
$notes-role-border-color: #e4e4e4; $notes-role-border-color: #e4e4e4;
$note-disabled-comment-color: #b2b2b2;
$note-form-border-color: #e5e5e5;
$note-toolbar-color: #959494;
$zen-control-hover-color: #111;

4
app/assets/stylesheets/framework/zen.scss
View file

@ -40,7 +40,7 @@
} }
.zen-control-full { .zen-control-full {
color: #959494; color: $note-toolbar-color;
&:hover { &:hover {
color: $gl-link-color; color: $gl-link-color;
@ -57,6 +57,6 @@
font-size: 36px; font-size: 36px;
&:hover { &:hover {
color: #111; color: $zen-control-hover-color;
} }
} }

18
app/assets/stylesheets/pages/merge_requests.scss
View file

@ -195,24 +195,6 @@
line-height: 31px; line-height: 31px;
} }
.disabled-comment {
margin-left: -$gl-padding-top;
margin-right: -$gl-padding-top;
background-color: $gray-light;
border-radius: $border-radius-base;
border: 1px solid $border-gray-normal;
color: #b2b2b2;
line-height: 200px;
.disabled-comment-text {
line-height: normal;
}
a {
color: $gl-link-color;
}
}
.builds { .builds {
.table-holder { .table-holder {
overflow-x: scroll; overflow-x: scroll;

11
app/assets/stylesheets/pages/note_form.scss
View file

@ -58,17 +58,17 @@
.common-note-form { .common-note-form {
.md-area { .md-area {
padding: $gl-padding-top $gl-padding; padding: $gl-padding-top $gl-padding;
border: 1px solid #e5e5e5; border: 1px solid $note-form-border-color;
border-radius: $border-radius-base; border-radius: $border-radius-base;
&.is-focused { &.is-focused {
border-color: #3b99fc; border-color: $focus-border-color;
box-shadow: 0 0 2px rgba(#000, .2), box-shadow: 0 0 2px rgba(#000, .2),
0 0 4px rgba(#3b99fc, .5); 0 0 4px rgba($focus-border-color, .4);
.comment-toolbar, .comment-toolbar,
.nav-links { .nav-links {
border-color: #3b99fc; border-color: $focus-border-color;
} }
} }
} }
@ -139,6 +139,7 @@
.comment-toolbar { .comment-toolbar {
padding-top: $gl-padding-top; padding-top: $gl-padding-top;
color: $note-toolbar-color;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
} }
@ -146,7 +147,6 @@
padding: 0; padding: 0;
background: none; background: none;
border: 0; border: 0;
color: #959494;
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;
@ -176,7 +176,6 @@
} }
.toolbar-text { .toolbar-text {
color: #959494;
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;

18
app/assets/stylesheets/pages/notes.scss
View file

@ -287,3 +287,21 @@ ul.notes {
} }
} }
} }
.disabled-comment {
margin-left: -$gl-padding-top;
margin-right: -$gl-padding-top;
background-color: $gray-light;
border-radius: $border-radius-base;
border: 1px solid $border-gray-normal;
color: $note-disabled-comment-color;
line-height: 200px;
.disabled-comment-text {
line-height: normal;
}
a {
color: $gl-link-color;
}
}