diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-08 12:48:11 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-08 12:48:11 -0500 |
| commit | 463905929ef9d85bcd6f5b430fd2bdb25311c17c (patch) | |
| tree | 49f3683a569e690c54749982c2d0f09be6f9413a | |
| parent | 8429f6f409eb8911d21095bc0fff3db2e53efd22 (diff) | |
| download | gitlab-ce-new-branch-position-fix.tar.gz | |
fixes new branch button positioning, when visible and not visible containernew-branch-position-fix
| -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 |