diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-08 10:19:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-08 10:19:46 +0000 |
| commit | 45aea8c79cace58d5babb185be707319224c59b2 (patch) | |
| tree | 5f5d3922e48bd90adfdf071cde86abe3274d026f /app | |
| parent | e4411a96128b1fef8f5a59e80764f3dfc66a9205 (diff) | |
| parent | ad8366ed84b9c32c24c0ffe1c0a071f726cb119f (diff) | |
| download | gitlab-ce-45aea8c79cace58d5babb185be707319224c59b2.tar.gz | |
Merge branch 'banner-out-of-place' into 'master'
css change to height to make gray container fit
Fixes #5893
See merge request !2337
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/events.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index 282aaf2219b..984b4b91216 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -138,6 +138,7 @@ */ .event-last-push { overflow: auto; + width: 100%; .event-last-push-text { @include str-truncated(100%); padding: 5px 0; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index be6ef43e49c..0133a0d6822 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -415,6 +415,7 @@ ul.nav.nav-projects-tabs { border-bottom: 1px solid #EEE; margin: 0 -16px; padding: 0 $gl-padding; + height: 57px; ul.left-top-menu { display: inline-block; |