diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-16 13:45:14 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-16 13:45:14 +0100 |
| commit | 259a7d7ba5ae0abc2ba6b3e104643fd6fae6ddfc (patch) | |
| tree | 6908e332942a70649bbebb30e7ea88682671e7c4 | |
| parent | 40104746d6418b54cd80726d77c05e85cf2ddbb3 (diff) | |
| parent | 37a4e4945d0cc944bc34f3ff3396ff7932d4aba0 (diff) | |
| download | gitlab-ce-259a7d7ba5ae0abc2ba6b3e104643fd6fae6ddfc.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -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 |