kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'new-branch-position-fix' into 'master'

Browse source 
fixes new branch button positioning, when visible and not visible container

Fixes #5893
#5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. 

See merge request !2348
This commit is contained in:
Dmitriy Zaporozhets 2016-01-11 09:41:32 +00:00
commit e9f84c4c8c
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/pages/projects.scss
View file

@ -411,11 +411,15 @@ ul.nav.nav-projects-tabs {
} }
} }
.last-push-widget {
margin-top: -1px;
}
.top-area { .top-area {
border-bottom: 1px solid #EEE; border-bottom: 1px solid #EEE;
margin: 0 -16px; margin: 0 -16px;
padding: 0 $gl-padding; padding: 0 $gl-padding;
height: 57px; height: 42px;
ul.left-top-menu { ul.left-top-menu {
display: inline-block; display: inline-block;
@ -522,6 +526,7 @@ pre.light-well {
.projects-search-form { .projects-search-form {
margin: -$gl-padding; margin: -$gl-padding;
padding: $gl-padding; padding: $gl-padding;
padding-bottom: 0;
margin-bottom: 0px; margin-bottom: 0px;
input { input {

2
app/views/events/_event_last_push.html.haml
View file

@ -1,5 +1,5 @@
- if show_last_push_widget?(event) - if show_last_push_widget?(event)
.gray-content-block.clear-block .gray-content-block.clear-block.last-push-widget
.event-last-push .event-last-push
.event-last-push-text .event-last-push-text
%span You pushed to %span You pushed to