Commit 95a87689 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'gt-fix-quick-links-button-styles' into 'master'

Fix quick links button styles

Closes #52220 and #52063

See merge request gitlab-org/gitlab-ce!22657
parents 5e65d498 3f177814
// For tabbed navigation links, scrolling tabs, etc. For all top/main navigation,
// please check nav.scss
.nav-links {
.nav-links:not(.quick-links) {
display: flex;
padding: 0;
margin: 0;
......@@ -106,7 +106,7 @@
display: inline-block;
float: right;
text-align: right;
padding: 11px 0;
padding: $gl-padding-8 0;
margin-bottom: 0;
> .btn,
......
......@@ -176,7 +176,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
AnchorData.new(false,
_('New file'),
project_new_blob_path(project, default_branch || 'master'),
'new')
'success')
end
end
......
......@@ -36,7 +36,7 @@
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
.fade-left= icon('angle-left')
.fade-right= icon('angle-right')
.nav-links.scrolling-tabs
.nav-links.scrolling-tabs.quick-links
= render 'stat_anchor_list', anchors: @project.empty_repo_statistics_anchors
= render 'stat_anchor_list', anchors: @project.empty_repo_statistics_buttons
......
......@@ -22,7 +22,7 @@
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
.fade-left= icon('angle-left')
.fade-right= icon('angle-right')
.nav-links.scrolling-tabs
.nav-links.scrolling-tabs.quick-links
= render 'stat_anchor_list', anchors: @project.statistics_anchors(show_auto_devops_callout: show_auto_devops_callout)
= render 'stat_anchor_list', anchors: @project.statistics_buttons(show_auto_devops_callout: show_auto_devops_callout)
......
---
title: Fix quick links button styles
merge_request: 22657
author: George Tsiolis
type: fixed
......@@ -239,7 +239,7 @@ describe ProjectPresenter do
expect(presenter.new_file_anchor_data).to have_attributes(enabled: false,
label: "New file",
link: presenter.project_new_blob_path(project, 'master'),
class_modifier: 'new')
class_modifier: 'success')
end
it 'returns nil if user cannot push' do
......
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