diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-28 11:48:01 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-28 11:48:01 +0300 |
| commit | fd6e1288246c69f984c57d60adf28636e48af66a (patch) | |
| tree | 3d39762f8149e8b5aa08da45462a90a0c9f4a1cb | |
| parent | e170cd9af337eec046c6cf3a372996e3955b9cdf (diff) | |
Keep navigation in fluid container
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 6 | ||||
| -rw-r--r-- | app/views/layouts/nav/_group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_profile.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index c303380764b..2a3f6d5a432 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -26,9 +26,9 @@ header { z-index: 100; margin-bottom: 0; min-height: $header-height; - background-color: #fff; + background-color: $gray-light; border: none; - border-bottom: 1px solid #eee; + border-bottom: 1px solid $gray-light; .container-fluid { width: 100% !important; @@ -47,7 +47,7 @@ header { text-align: center; &:hover, &:focus, &:active { - background-color: #fff; + background-color: $gray-light; } } diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index e41fb90ca2e..06733ba628a 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -1,4 +1,4 @@ -%div{ class: container_class } +.container-fluid - if current_user .controls %span.dropdown.group-settings-dropdown diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml index 4290655e9aa..b9f7f3b1cdc 100644 --- a/app/views/layouts/nav/_profile.html.haml +++ b/app/views/layouts/nav/_profile.html.haml @@ -1,4 +1,4 @@ -%div{ class: container_class } +.container-fluid %ul.nav-links = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = link_to profile_path, title: 'Profile Settings' do diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 680c3415bab..8a9834ca5d8 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -1,4 +1,4 @@ -%div{ class: container_class } +.container-fluid - if current_user .controls %span.dropdown.project-settings-dropdown |