diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-15 08:32:01 +0100 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-04-20 15:43:32 -0400 |
| commit | 5c8959bbc15ec47d8be62e8e1362e441cdd91d69 (patch) | |
| tree | 4d3a93c1f282e826b7586a01503125a14bb14c5e /app/assets | |
| parent | 461608e14c628c59eb724ba8674da7d496c666c2 (diff) | |
| download | gitlab-ce-5c8959bbc15ec47d8be62e8e1362e441cdd91d69.tar.gz | |
Added variables
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 14 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 9ec0db324c9..fd395041c3d 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -432,7 +432,7 @@ display: block; position: relative; top: -2px; - color: #707070; + color: $dropdown-title-btn-color; font: normal normal normal 14px/1 FontAwesome; font-size: inherit; text-rendering: auto; @@ -445,7 +445,7 @@ .ui-state-active, .ui-state-hover { color: $md-link-color; - background-color: #ecf3fe; + background-color: $calendar-hover-bg; } .ui-datepicker-prev, @@ -484,7 +484,7 @@ td { padding: 0; - border: 1px solid rgba(#000, .1); + border: 1px solid $calendar-border-color; &:first-child { border-left: 0; @@ -502,7 +502,7 @@ } .ui-datepicker-title { - color: #555; + color: $gl-gray; font-size: 15px; line-height: 1; font-weight: normal; @@ -511,13 +511,13 @@ th { padding: 2px 0; - color: #b8b8b8; + color: $calendar-header-color; font-weight: normal; text-transform: lowercase; - border-top: 1px solid rgba(#000, .1); + border-top: 1px solid $calendar-border-color; } .ui-datepicker-unselectable { - background-color: #faf9f9; + background-color: $calendar-unselectable-bg; } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index f910cf61817..30ca27ab104 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -241,3 +241,8 @@ $note-form-border-color: #e5e5e5; $note-toolbar-color: #959494; $zen-control-hover-color: #111; + +$calendar-header-color: #b8b8b8; +$calendar-hover-bg: #ecf3fe; +$calendar-border-color: rgba(#000, .1); +$calendar-unselectable-bg: #faf9f9; |