diff options
| author | Andrey <ad@2d-arts.com> | 2015-12-16 10:57:02 +0000 |
|---|---|---|
| committer | Andrey <ad@2d-arts.com> | 2015-12-16 10:57:02 +0000 |
| commit | 37a4e4945d0cc944bc34f3ff3396ff7932d4aba0 (patch) | |
| tree | e4d951c1705bf2d1d7987b2bca70f5f76682059f | |
| parent | 5ffed49fef07a06f46f7e4e3511d7f6b9f378892 (diff) | |
| parent | 51c8d037d37f19fdbf4ad89e1a1c39da9ca4f150 (diff) | |
| download | gitlab-ce-37a4e4945d0cc944bc34f3ff3396ff7932d4aba0.tar.gz | |
Merge branch 'fix-profile-nav' into 'master'
Make profile navigation full wide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
## Before
## After
See merge request !2076
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 5 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 88da799ee2b..7562ef6d24b 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -401,6 +401,11 @@ table { border-bottom: 1px solid $border-color; height: 57px; } + + &.wide { + margin-left: -$gl-padding; + margin-right: -$gl-padding; + } } .center-middle-menu { diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index a0a6e2d9810..b7a7eb4e6f7 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -73,7 +73,7 @@ .user-calendar-activities -%ul.center-top-menu.no-top.no-bottom.bottom-border +%ul.center-top-menu.no-top.no-bottom.bottom-border.wide %li.active = link_to "#activity", 'data-toggle' => 'tab' do Activity |