home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2015-12-16 13:45:14 +01:00
parent 40104746d6 37a4e4945d
commit 259a7d7ba5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/framework/common.scss
+5
View File
@@ -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 {
app/views/users/show.html.haml
+1 -1
View File
@@ -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