Commit e9c1d15f authored by Paul Slaughter's avatar Paul Slaughter

Fix button styles in repo header

Some inconsistencies were introduced when we
added `gl-button` so lets update the rest for consistency.

While we're here, we can also fix some responsive issues.
parent 3299c9b5
......@@ -24,5 +24,5 @@ export default {
</script>
<template>
<gl-link :href="path" :class="cssClass" class="btn">{{ text }}</gl-link>
<gl-link :href="path" :class="cssClass" class="btn gl-button">{{ text }}</gl-link>
</template>
......@@ -61,7 +61,6 @@ export default {
<gl-dropdown
v-if="hasMultipleActions"
v-gl-tooltip="selectedAction.tooltip"
class="gl-button-deprecated-adapter"
:text="selectedAction.text"
:split-href="selectedAction.href"
:variant="variant"
......
......@@ -169,7 +169,7 @@ export default {
</script>
<template>
<div class="d-inline-block gl-ml-3">
<div class="gl-sm-ml-3">
<actions-button
:actions="actions"
:selected-key="selection"
......
......@@ -62,7 +62,7 @@
.tree-controls {
margin-bottom: 10px;
.btn,
.btn:not(.dropdown-toggle-split),
.dropdown,
.btn-group {
width: 100%;
......
= link_to project_find_file_path(@project, @ref), class: 'btn shortcuts-find-file', rel: 'nofollow' do
= link_to project_find_file_path(@project, @ref), class: 'gl-button btn shortcuts-find-file', rel: 'nofollow' do
= _('Find file')
......@@ -2,7 +2,7 @@
- dropdown_class = local_assigns.fetch(:dropdown_class, '')
.git-clone-holder.js-git-clone-holder
%a#clone-dropdown.btn.btn-primary.clone-dropdown-btn.qa-clone-dropdown{ href: '#', data: { toggle: 'dropdown' } }
%a#clone-dropdown.gl-button.btn.btn-primary.clone-dropdown-btn.qa-clone-dropdown{ href: '#', data: { toggle: 'dropdown' } }
%span.gl-mr-2.js-clone-dropdown-label
= _('Clone')
= sprite_icon("chevron-down", css_class: "icon")
......
......@@ -3,7 +3,7 @@
- if !project.empty_repo? && can?(current_user, :download_code, project)
- archive_prefix = "#{project.path}-#{ref.tr('/', '-')}"
.project-action-button.dropdown.inline>
%button.btn.has-tooltip{ title: s_('DownloadSource|Download'), 'data-toggle' => 'dropdown', 'aria-label' => s_('DownloadSource|Download'), 'data-display' => 'static', data: { qa_selector: 'download_source_code_button' } }
%button.gl-button.btn.has-tooltip{ title: s_('DownloadSource|Download'), 'data-toggle' => 'dropdown', 'aria-label' => s_('DownloadSource|Download'), 'data-display' => 'static', data: { qa_selector: 'download_source_code_button' } }
= sprite_icon('download')
%span.sr-only= _('Select Archive Format')
= sprite_icon("chevron-down")
......
%a.btn.btn-default{ href: xcode_uri_to_repo(@project) }
%a.gl-button.btn.btn-default{ href: xcode_uri_to_repo(@project) }
= _("Open in Xcode")
......@@ -13,7 +13,7 @@
= render 'shared/web_ide_button', blob: nil
- if show_xcode_link?(@project)
.project-action-button.project-xcode.inline<
.project-action-button.project-xcode<
= render "projects/buttons/xcode_link"
= render 'projects/buttons/download', project: @project, ref: @ref
......
---
title: Update button styles in project tree header
merge_request: 47562
author:
type: other
= lock_file_link(html_options: { class: "btn path-lock js-path-lock js-hide-on-root hidden" })
= lock_file_link(html_options: { class: "btn path-lock js-path-lock js-hide-on-root hidden gl-button" })
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment