diff options
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/buttons/_download.html.haml | 16 |
2 files changed, 8 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 22ee12362fa..efcd35a2e0e 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -355,12 +355,6 @@ .dropdown-menu-content { padding: $dropdown-item-padding-y $dropdown-item-padding-x; } - - .inline-content { - display: inline-block; - margin: 0; - padding: 0; - } } .droplab-dropdown { diff --git a/app/views/projects/buttons/_download.html.haml b/app/views/projects/buttons/_download.html.haml index ebd4a7189ed..1cba2ea6b8d 100644 --- a/app/views/projects/buttons/_download.html.haml +++ b/app/views/projects/buttons/_download.html.haml @@ -11,26 +11,26 @@ %li.dropdown-bold-header= _('Download source code') %li.dropdown-menu-content %ul - %li.inline-content + %li.d-inline-block.m-0.p-0 = link_to _('zip'), project_archive_path(project, id: tree_join(ref, archive_prefix), format: 'zip'), rel: 'nofollow', download: '', class: 'btn btn-primary btn-xs' - %li.inline-content + %li.d-inline-block.m-0.p-0 = link_to _('tar.gz'), project_archive_path(project, id: tree_join(ref, archive_prefix), format: 'tar.gz'), rel: 'nofollow', download: '', class: 'btn btn-xs' - %li.inline-content + %li.d-inline-block.m-0.p-0 = link_to _('tar.bz2'), project_archive_path(project, id: tree_join(ref, archive_prefix), format: 'tar.bz2'), rel: 'nofollow', download: '', class: 'btn btn-xs' - %li.inline-content + %li.d-inline-block.m-0.p-0 = link_to _('tar'), project_archive_path(project, id: tree_join(ref, archive_prefix), format: 'tar'), rel: 'nofollow', download: '', class: 'btn btn-xs' - if directory? %li.separator %li.dropdown-bold-header= _('Download this directory') %li.dropdown-menu-content %ul - %li.inline-content + %li.d-inline-block.m-0.p-0 = link_to _('zip'), project_archive_path(project, id: tree_join(ref, archive_prefix), path: @path, format: 'zip'), rel: 'nofollow', download: '', class: 'btn btn-primary btn-xs' - %li.inline-content + %li.d-inline-block.m-0.p-0 = link_to _('tar.gz'), project_archive_path(project, id: tree_join(ref, archive_prefix), path: @path, format: 'tar.gz'), rel: 'nofollow', download: '', class: 'btn btn-xs' - %li.inline-content + %li.d-inline-block.m-0.p-0 = link_to _('tar.bz2'), project_archive_path(project, id: tree_join(ref, archive_prefix), path: @path, format: 'tar.bz2'), rel: 'nofollow', download: '', class: 'btn btn-xs' - %li.inline-content + %li.d-inline-block.m-0.p-0 = link_to _('tar'), project_archive_path(project, id: tree_join(ref, archive_prefix), path: @path, format: 'tar'), rel: 'nofollow', download: '', class: 'btn btn-xs' - if pipeline && pipeline.latest_builds_with_artifacts.any? %li.separator |