Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

259a7d7b · Dmitriy Zaporozhets · 40104746 · 37a4e494 · 259a7d7b · 259a7d7b
Commit 259a7d7b authored Dec 16, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

app/assets/stylesheets/framework/common.scss app/assets/stylesheets/framework/common.scss +5 -0

app/views/users/show.html.haml app/views/users/show.html.haml +1 -1

No files found.
--- 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 {

--- 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