diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-11-01 14:41:17 +0000 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2017-11-01 14:41:17 +0000 |
| commit | 3cd29ffe53fa38ce1b77d2c4e0d806edd340d120 (patch) | |
| tree | 81a2548e1d268d9695571ddccbf68f070f018f68 /app/assets/stylesheets/framework/variables.scss | |
| parent | a5f586c0361b371f6bfc24a6de219cf6a178d85e (diff) | |
| parent | 5c1459ef0f1fa4f091ccb735aba9fd918f53105d (diff) | |
| download | gitlab-ce-an/gitaly-timeouts.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into an/gitaly-timeoutsan/gitaly-timeouts
# Conflicts:
# app/models/application_setting.rb
# db/schema.rb
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index d5ca23ff870..8ab48e4844f 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -9,6 +9,8 @@ $sidebar-transition-duration: .15s; $sidebar-breakpoint: 1024px; $default-transition-duration: .15s; $right-sidebar-transition-duration: .3s; +$contextual-sidebar-width: 220px; +$contextual-sidebar-collapsed-width: 50px; /* * Color schema @@ -359,6 +361,13 @@ $filtered-search-term-shadow-color: rgba(0, 0, 0, 0.09); $dropdown-hover-color: $blue-400; /* +* Contextual Sidebar +*/ +$link-active-background: rgba(0, 0, 0, .04); +$link-hover-background: rgba(0, 0, 0, .06); +$inactive-badge-background: rgba(0, 0, 0, .08); + +/* * Buttons */ $btn-active-gray: #ececec; @@ -404,7 +413,6 @@ $note-targe3-inside: #ffffd3; $note-line2-border: #ddd; $note-icon-gutter-width: 55px; - /* * Zen */ |