diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-04 13:11:38 -0500 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-04 13:11:38 -0500 |
commit | 4ed9e5f5bebc5d3e11c21a929fdf57b8b014a31b (patch) | |
tree | 02e10be70505ec1e8039612461aa1b5e87ee03ad /app/assets/stylesheets/framework | |
parent | 003b36b45f38ca3116af5d9179fff4adb26a4eb1 (diff) | |
download | gitlab-ce-4ed9e5f5bebc5d3e11c21a929fdf57b8b014a31b.tar.gz |
Update font colors, font sizes, caret icon, avatar size
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r-- | app/assets/stylesheets/framework/avatar.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 33 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 |
4 files changed, 40 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss index 5aa425dab6c..f5ce70b606b 100644 --- a/app/assets/stylesheets/framework/avatar.scss +++ b/app/assets/stylesheets/framework/avatar.scss @@ -28,6 +28,7 @@ &.s46 { width: 46px; height: 46px; margin-right: 15px; } &.s48 { width: 48px; height: 48px; margin-right: 10px; } &.s60 { width: 60px; height: 60px; margin-right: 12px; } + &.s70 { width: 70px; height: 70px; margin-right: 14px; } &.s90 { width: 90px; height: 90px; margin-right: 15px; } &.s110 { width: 110px; height: 110px; margin-right: 15px; } &.s140 { width: 140px; height: 140px; margin-right: 20px; } diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index a78b1f30e61..e85eac585f2 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -158,6 +158,10 @@ padding: 24px 0; .group-info { + .cover-title { + margin-top: 9px; + } + p { margin-bottom: 0; } @@ -173,8 +177,12 @@ } .group-info { + h1 { display: inline; + font-weight: normal; + font-size: 24px; + color: $gl-title-color; } } } diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index c79de099d38..5c205ab7245 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -203,7 +203,21 @@ .controls { float: right; - padding: 12px 5px 0 0; + padding: 7px 5px 0 0; + + i { + color: $layout-link-gray; + } + + .fa-rss, + .fa-cog { + font-size: 16px; + } + + .fa-caret-down { + margin-left: 5px; + color: $gl-icon-color; + } .dropdown { margin-left: 7px; @@ -234,15 +248,28 @@ li { + a { + padding-top: 10px; + } + + a, i { + color: $layout-link-gray; + } + + &.active { + a, i { + color: $black; + } + } + .badge { color: $gl-icon-color; } - } } } .page-with-layout-nav { - margin-top: 56px; + margin-top: 52px; } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 7c695ba8f46..6c8cdcded1f 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -75,6 +75,7 @@ $settings-icon-size: 18px; $provider-btn-group-border: #e5e5e5; $provider-btn-not-active-color: #4688f1; $link-underline-blue: #4a8bee; +$layout-link-gray: #7e7c7c; /* * Color schema |