diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-23 12:54:04 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-23 12:54:04 -0500 |
| commit | 75532a65702cafc890ec83126a8ca948a8683015 (patch) | |
| tree | 806b165c31c23a5ce3fefc598e8ed20bcd58c674 /app/assets/stylesheets/framework | |
| parent | 3c8d209e16c606c5122d5aee455d051e65c6dab0 (diff) | |
| download | gitlab-ce-75532a65702cafc890ec83126a8ca948a8683015.tar.gz | |
Change rgba to hex; use sass variables to calculate header height
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 4e4a1d71a47..c70be58f48f 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -290,6 +290,6 @@ } .right-sidebar { - top: 102px; + top: ($header-height * 2) + 2; } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index a769077bc83..9ad20ad22ab 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -119,7 +119,7 @@ $border-white-light: #f1f2f4; $border-white-normal: #d6dae2; $border-white-dark: #c6cacf; -$border-gray-light: rgba(209, 209, 209, 0.70); +$border-gray-light: #dcdcdc; $border-gray-normal: rgba(0, 0, 0, 0.10); $border-gray-dark: #c6cacf; |