diff options
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 10 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 14 |
2 files changed, 8 insertions, 16 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index d2f491daf78..58c750bc373 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -377,10 +377,9 @@ table { .center-top-menu { @include nav-menu; text-align: center; - margin-top: 5px; - margin-bottom: $gl-padding; height: 56px; - margin-top: -$gl-padding; + margin: -$gl-padding; + margin-bottom: $gl-padding; padding-top: $gl-padding; &.no-bottom { @@ -390,6 +389,11 @@ table { &.no-top { margin-top: 0; } + + &.bottom-border { + border-bottom: 1px solid $border-color; + height: 57px; + } } .center-middle-menu { diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index e35e69bda80..a0a6e2d9810 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 +%ul.center-top-menu.no-top.no-bottom.bottom-border %li.active = link_to "#activity", 'data-toggle' => 'tab' do Activity @@ -92,26 +92,17 @@ .tab-content .tab-pane.active#activity - .gray-content-block.middle-block - Public activity by #{@user.name} - .content_list = spinner - if @groups.any? .tab-pane#groups - .gray-content-block.middle-block - Groups #{@user.name} is a member of - %ul.content-list - @groups.each do |group| = render 'shared/groups/group', group: group - if @contributed_projects.present? .tab-pane#contributed - .gray-content-block.middle-block - Projects #{@user.name} has contributed to - .contributed-projects = render 'shared/projects/list', projects: @contributed_projects.sort_by(&:star_count).reverse, @@ -119,9 +110,6 @@ - if @projects.present? .tab-pane#personal - .gray-content-block.middle-block - Projects owned by #{@user.name} - .personal-projects = render 'shared/projects/list', projects: @projects.sort_by(&:star_count).reverse, |