diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-16 12:05:23 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-21 14:45:23 +0100 |
| commit | 9e6113a293d8a8ea956db160a8b5c74db0f3aa93 (patch) | |
| tree | ff475f658cc7191ee8aa0bdda0f92d79cb578d72 | |
| parent | b9ba97f135b8dae6afecf6129a70b3c905333be1 (diff) | |
| download | gitlab-ce-9e6113a293d8a8ea956db160a8b5c74db0f3aa93.tar.gz | |
spacing fixes
made the title a link back to the dashboard
[ci skip]
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/new_nav.scss | 30 | ||||
| -rw-r--r-- | app/views/layouts/header/_new.html.haml | 3 |
3 files changed, 31 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index e7d58449cec..c2a17c22524 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -227,7 +227,7 @@ header { } a { - color: $gl-text-color; + color: currentColor; &:hover { text-decoration: underline; diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss index e15bdee800b..ae4f78e3053 100644 --- a/app/assets/stylesheets/new_nav.scss +++ b/app/assets/stylesheets/new_nav.scss @@ -18,11 +18,19 @@ header.navbar-gitlab-new { .title { padding-top: 14px; - padding-right: 10px; + padding-right: 9px; color: currentColor; @media (min-width: $screen-sm-min) { - padding-right: 20px; + padding-right: 15px; + } + + a { + &:hover, + &:focus { + color: currentColor; + text-decoration: none; + } } } @@ -35,6 +43,11 @@ header.navbar-gitlab-new { .dropdown-menu { margin-top: 4px; min-width: 130px; + + @media (max-width: $screen-xs-max) { + left: auto; + right: 0; + } } } @@ -122,4 +135,17 @@ header.navbar-gitlab-new { .search-input::placeholder { color: $gray-normal; } + + .location-badge { + color: $gray-normal; + background-color: #2d2d2d; + } + + &.search-active { + .search-input-wrap { + i { + color: $gray-normal; + } + } + } } diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml index 1ae89f4a4b6..addd58a8fa2 100644 --- a/app/views/layouts/header/_new.html.haml +++ b/app/views/layouts/header/_new.html.haml @@ -8,7 +8,8 @@ .title-container %h1.title - GitLab + = link_to root_path, title: 'Dashboard' do + GitLab - if current_user = render "layouts/nav/new_dashboard" |