diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-13 12:34:36 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-12-14 09:23:41 -0600 |
| commit | 14780b22416ba0b094d77d96c668d95ee6e9eca9 (patch) | |
| tree | 9d59ffd237a3d333f236366e04ebfed3a7598cf9 | |
| parent | b70b962892b2428557d95a9639fbcead4fe546fd (diff) | |
| download | gitlab-ce-24668-project-homepage-dropdown-menus-obscured-in-certain-viewport-sizes.tar.gz | |
fix project homepage dropdown button overflow behavior24668-project-homepage-dropdown-menus-obscured-in-certain-viewport-sizes
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 35 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 21 |
2 files changed, 19 insertions, 37 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 6e0f6b1cd81..abdbb31cf1f 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -482,44 +482,21 @@ a.deploy-project-label { } } -.page-sidebar-pinned { - .project-stats .nav > li.right { - @media (min-width: $screen-lg-min) { - float: none; - } - } - - .download-button { - @media (min-width: $screen-lg-min) { - margin-left: 0; - } - } -} - .project-stats { font-size: 0; border-bottom: 1px solid $border-color; .nav { - padding-top: 12px; - padding-bottom: 12px; + padding: 6px 0; } .nav > li { display: inline-block; + margin: 6px 0; &:not(:last-child) { margin-right: $gl-padding; } - - &.right { - vertical-align: top; - margin-top: 0; - - @media (min-width: $screen-lg-min) { - float: right; - } - } } .nav > li > a { @@ -550,6 +527,14 @@ a.deploy-project-label { background-color: $gray-normal; } } + + li.project-repo-buttons { + float: right; + } + + .notification-dropdown { + display: inline-block; + } } pre.light-well { diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index c50093cf47c..c3a24d4f3e9 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -66,18 +66,15 @@ = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do Set Up CI - %li.project-repo-buttons.right - .project-right-buttons - - if current_user - = render 'shared/members/access_request_buttons', source: @project - = render "projects/buttons/koding" - - .btn-group.project-repo-btn-group - = render 'projects/buttons/download', project: @project, ref: @ref - = render 'projects/buttons/dropdown' - - .pull-right - = render 'shared/notifications/button', notification_setting: @notification_setting + %li.project-repo-buttons + - if current_user + = render 'shared/members/access_request_buttons', source: @project + = render "projects/buttons/koding" + + .btn-group.project-repo-btn-group + = render 'projects/buttons/download', project: @project, ref: @ref + = render 'projects/buttons/dropdown' + = render 'shared/notifications/button', notification_setting: @notification_setting - if @repository.commit .project-last-commit{ class: container_class } = render 'projects/last_commit', commit: @repository.commit, ref: current_ref, project: @project |