diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 09:41:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 09:41:32 +0000 |
| commit | e9f84c4c8c52e5016f19e7cd5fea0a1a09ec93be (patch) | |
| tree | 3c1c8c88d7a36e856d4e8f60d70e3e1c24b91ffc | |
| parent | e3c024f712af86b81f68b5e29b47d9c301d2b8e7 (diff) | |
| parent | 463905929ef9d85bcd6f5b430fd2bdb25311c17c (diff) | |
| download | gitlab-ce-e9f84c4c8c52e5016f19e7cd5fea0a1a09ec93be.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 7 | ||||
| -rw-r--r-- | app/views/events/_event_last_push.html.haml | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 0133a0d6822..d32509b7d49 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -411,11 +411,15 @@ ul.nav.nav-projects-tabs { } } +.last-push-widget { + margin-top: -1px; +} + .top-area { border-bottom: 1px solid #EEE; margin: 0 -16px; padding: 0 $gl-padding; - height: 57px; + height: 42px; ul.left-top-menu { display: inline-block; @@ -522,6 +526,7 @@ pre.light-well { .projects-search-form { margin: -$gl-padding; padding: $gl-padding; + padding-bottom: 0; margin-bottom: 0px; input { diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml index ffc37ad6178..abea86b026a 100644 --- a/app/views/events/_event_last_push.html.haml +++ b/app/views/events/_event_last_push.html.haml @@ -1,5 +1,5 @@ - 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-text %span You pushed to |