Commit dffa2fa9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use sass variabled for backgroung and border colors

parent 2da27205
...@@ -716,8 +716,8 @@ $panel-border-radius: 0; ...@@ -716,8 +716,8 @@ $panel-border-radius: 0;
// $panel-footer-bg: #f5f5f5 // $panel-footer-bg: #f5f5f5
$panel-default-text: $text-color; $panel-default-text: $text-color;
// $panel-default-border: #ddd $panel-default-border: $border-color;
// $panel-default-heading-bg: #f5f5f5 $panel-default-heading-bg: $background-color;
// $panel-primary-text: #fff // $panel-primary-text: #fff
// $panel-primary-border: $brand-primary // $panel-primary-border: $brand-primary
......
$style_color: #474D57; $style_color: #474D57;
$hover: #FFF3EB; $hover: #FFF3EB;
$box_bg: #F9F9F9;
$gl-link-color: #446e9b; $gl-link-color: #446e9b;
$nprogress-color: #c0392b; $nprogress-color: #c0392b;
$gl-font-size: 14px; $gl-font-size: 14px;
...@@ -9,6 +8,8 @@ $sidebar_width: 230px; ...@@ -9,6 +8,8 @@ $sidebar_width: 230px;
$avatar_radius: 50%; $avatar_radius: 50%;
$code_font_size: 13px; $code_font_size: 13px;
$code_line_height: 1.5; $code_line_height: 1.5;
$border-color: #dce4ec;
$background-color: #ECF0F1;
/* /*
* State colors: * State colors:
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
*/ */
.file-holder { .file-holder {
border: 1px solid #CCC; border: 1px solid $border-color;
margin-bottom: 1em; margin-bottom: 1em;
table { table {
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
} }
.file-title { .file-title {
background: #EEE; position: relative;
border-bottom: 1px solid #CCC; background: $background-color;
border-bottom: 1px solid $border-color;
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
margin: 0; margin: 0;
text-align: left; text-align: left;
...@@ -20,8 +21,9 @@ ...@@ -20,8 +21,9 @@
.file-actions { .file-actions {
float: right; float: right;
position: relative; position: absolute;
top: -5px; top: 5px;
right: 15px;
.btn { .btn {
padding: 0px 10px; padding: 0px 10px;
...@@ -113,7 +115,7 @@ ...@@ -113,7 +115,7 @@
ol { ol {
margin-left: 40px; margin-left: 40px;
padding: 10px 0; padding: 10px 0;
border-left: 1px solid #CCC; border-left: 1px solid $border-color;
margin-bottom: 0; margin-bottom: 0;
background: white; background: white;
li { li {
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
.note-text .code { .note-text .code {
border: none; border: none;
box-shadow: none; box-shadow: none;
background: $box_bg; background: $background-color;
padding: 1em; padding: 1em;
overflow-x: auto; overflow-x: auto;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.select2-container, .select2-container.select2-drop-above { .select2-container, .select2-container.select2-drop-above {
.select2-choice { .select2-choice {
background: #FFF; background: #FFF;
border-color: #BBB; border-color: #CCC;
padding: 6px 14px; padding: 6px 14px;
line-height: 1.42857143; line-height: 1.42857143;
height: auto; height: auto;
......
...@@ -9,7 +9,7 @@ table { ...@@ -9,7 +9,7 @@ table {
th { th {
font-weight: normal; font-weight: normal;
font-size: 15px; font-size: 15px;
border-bottom: 1px solid #CCC !important; border-bottom: 1px solid $border-color !important;
} }
td { td {
border-color: #F1F1F1 !important; border-color: #F1F1F1 !important;
......
.diff-file { .diff-file {
border: 1px solid #CCC; border: 1px solid $border-color;
margin-bottom: 1em; margin-bottom: 1em;
.diff-header { .diff-header {
@extend .clearfix; position: relative;
background: #EEE; background: $background-color;
border-bottom: 1px solid #CCC; border-bottom: 1px solid $border-color;
padding: 5px 5px 5px 10px; padding: 10px 15px;
color: #555; color: #555;
z-index: 10; z-index: 10;
> span { > span {
@include str-truncated(65%);
font-family: $monospace_font; font-family: $monospace_font;
line-height: 2;
} }
.diff-btn-group { .diff-btn-group {
float: right; float: right;
position: absolute;
top: 5px;
right: 15px;
.btn { .btn {
background-color: #FFF; padding: 0px 10px;
font-size: 13px;
line-height: 28px;
} }
} }
...@@ -87,7 +92,7 @@ ...@@ -87,7 +92,7 @@
background: #F5F5F5; background: #F5F5F5;
color: rgba(0,0,0,0.3); color: rgba(0,0,0,0.3);
padding: 0px 5px; padding: 0px 5px;
border-right: 1px solid #ccc; border-right: 1px solid $border-color;
text-align: right; text-align: right;
min-width: 35px; min-width: 35px;
max-width: 50px; max-width: 50px;
...@@ -136,7 +141,7 @@ ...@@ -136,7 +141,7 @@
background: #ffecec; background: #ffecec;
} }
&.matched { &.matched {
color: #ccc; color: $border-color;
background: #fafafa; background: #fafafa;
} }
&.parallel { &.parallel {
......
.project-network { .project-network {
border: 1px solid #CCC; border: 1px solid $border-color;
.controls { .controls {
color: #888; color: #888;
font-size: 14px; font-size: 14px;
padding: 5px; padding: 5px;
border-bottom: 1px solid #bbb; border-bottom: 1px solid $border-color;
background: #EEE; background: #EEE;
} }
......
...@@ -123,10 +123,10 @@ ...@@ -123,10 +123,10 @@
} }
.mr-state-widget { .mr-state-widget {
background: $box_bg; background: $background-color;
margin-bottom: 20px; margin-bottom: 20px;
color: #666; color: #666;
border: 1px solid #EEE; border: 1px solid $border-color;
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09)); @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));
.ci_widget { .ci_widget {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment