diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-30 08:48:39 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-31 12:58:50 +0100 |
| commit | ec9e0c1119c4e7dde55112bcfb04f7fb82825798 (patch) | |
| tree | a74a75a8bd6761f706eff106d2b521a7c5b2e651 | |
| parent | 0c3cef02b31f1f6818ed68b33e31db49e72ee260 (diff) | |
| download | gitlab-ce-ec9e0c1119c4e7dde55112bcfb04f7fb82825798.tar.gz | |
SCSS variables
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index bb49ae396c7..cfe9cd6e36c 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -207,3 +207,10 @@ $location-badge-bg: $gray-normal; $location-icon-color: #e7e9ed; $location-active-color: $gl-text-color; $location-active-bg: $search-input-border-color; + +/* + * Notes + */ +$notes-light-color: #8e8e8e; +$notes-action-color: #8f8f8f; +$notes-role-border-color: #e4e4e4; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 9f466a817fb..775b7857c49 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -176,7 +176,7 @@ ul.notes { .note-headline-light, .discussion-headline-light { - color: #8e8e8e; + color: $notes-light-color; } /** @@ -187,7 +187,7 @@ ul.notes { .note-actions { float: right; margin-left: 10px; - color: #8F8F8F; + color: $notes-action-color; } .note-action-button, @@ -219,10 +219,10 @@ ul.notes { display: inline-block; padding-left: 4px; padding-right: 4px; - color: #8F8F8F; + color: $notes-action-color; font-size: 12px; line-height: 20px; - border: 1px solid #E4E4E4; + border: 1px solid $notes-role-border-color; border-radius: $border-radius-base; } |