diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-06-09 14:40:14 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-06-09 14:40:14 +0530 |
| commit | 1779d68bfe2872c36f475798c5e1b82678f3225d (patch) | |
| tree | 8be5c6e486c1aa769ad95160219fe7f47ab1a57d /app/assets/stylesheets/framework/variables.scss | |
| parent | 1f5ecf916ee7b1d34fbf8775890b2aada2055384 (diff) | |
| parent | 3d72cb897efddc14021afe8b064aa2bff14c7c15 (diff) | |
| download | gitlab-ce-1779d68bfe2872c36f475798c5e1b82678f3225d.tar.gz | |
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index fc3589dad65..8db50063233 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -2,7 +2,7 @@ * Layout */ $sidebar_collapsed_width: 62px; -$sidebar_width: 220px; +$sidebar_width: 90px; $gutter_collapsed_width: 62px; $gutter_width: 290px; $gutter_inner_width: 258px; @@ -79,6 +79,9 @@ $provider-btn-not-active-color: #4688f1; $link-underline-blue: #4a8bee; $layout-link-gray: #7e7c7c; $todo-alert-blue: #428bca; +$btn-side-margin: 7px; +$btn-sm-side-margin: 5px; +$btn-xs-side-margin: 5px; /* * Color schema @@ -121,7 +124,7 @@ $border-white-normal: #d6dae2; $border-white-dark: #c6cacf; $border-gray-light: #dcdcdc; -$border-gray-normal: rgba(0, 0, 0, 0.10); +$border-gray-normal: #d7d7d7; $border-gray-dark: #c6cacf; $border-green-light: #2faa60; |