Commit e9f84c4c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

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
parents e3c024f7 46390592
...@@ -411,11 +411,15 @@ ul.nav.nav-projects-tabs { ...@@ -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 { ...@@ -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 {
......
- 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment