diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-17 21:47:03 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-17 21:47:03 +0000 |
| commit | 73ba88b53999124f8e252339c2a0d65d19468f12 (patch) | |
| tree | c66a1225c29283f35a2274053c9097eb1202d5dd | |
| parent | 1ffb32ed613129271c7668385fce4024292ca4ec (diff) | |
| parent | d94dc565ba479e969ad548991b411e058330d8f9 (diff) | |
| download | gitlab-ce-73ba88b53999124f8e252339c2a0d65d19468f12.tar.gz | |
Merge branch 'download-dropdown-alignment' into 'master'
Fixed alignment of download dropdown
With the new dropdown CSS - some dropdowns might look a bit odd
## Previously
## Now
See merge request !3245
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/repositories/_download_archive.html.haml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 3197ea84460..a48b6c17fa0 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -9,6 +9,12 @@ border-left: $caret-width-base solid transparent; } +.btn-group { + .caret { + margin-left: 0; + } +} + .dropdown { position: relative; } diff --git a/app/views/projects/repositories/_download_archive.html.haml b/app/views/projects/repositories/_download_archive.html.haml index b9486a9b492..24658319060 100644 --- a/app/views/projects/repositories/_download_archive.html.haml +++ b/app/views/projects/repositories/_download_archive.html.haml @@ -10,7 +10,7 @@ %span.caret %span.sr-only Select Archive Format - %ul.col-xs-10.dropdown-menu{ role: 'menu' } + %ul.col-xs-10.dropdown-menu.dropdown-menu-align-right{ role: 'menu' } %li = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do %i.fa.fa-download |