Commit 34fce96f authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch '222907-replace-angle-icons-with-chevron' into 'master'

Replace double angle icons with chevron

See merge request gitlab-org/gitlab!34736
parents bc6c67dd 2222ffef
...@@ -314,8 +314,8 @@ input[type=color].form-control { ...@@ -314,8 +314,8 @@ input[type=color].form-control {
.toggle-sidebar-button { .toggle-sidebar-button {
.collapse-text, .collapse-text,
.icon-angle-double-left, .icon-chevron-double-lg-left,
.icon-angle-double-right { .icon-chevron-double-lg-right {
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
} }
......
...@@ -98,11 +98,11 @@ ...@@ -98,11 +98,11 @@
width: $contextual-sidebar-collapsed-width - 1px; width: $contextual-sidebar-collapsed-width - 1px;
.collapse-text, .collapse-text,
.icon-angle-double-left { .icon-chevron-double-lg-left {
display: none; display: none;
} }
.icon-angle-double-right { .icon-chevron-double-lg-right {
display: block; display: block;
margin: 0; margin: 0;
} }
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
margin-right: 8px; margin-right: 8px;
} }
.icon-angle-double-right { .icon-chevron-double-lg-right {
display: none; display: none;
} }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
= issuable_meta(@issue, @project, "Issue") = issuable_meta(@issue, @project, "Issue")
%a.btn.btn-default.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" } %a.btn.btn-default.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
= icon('angle-double-left') = sprite_icon('chevron-double-lg-left')
.detail-page-header-actions.js-issuable-actions.js-issuable-buttons{ data: { "action": "close-reopen" } } .detail-page-header-actions.js-issuable-actions.js-issuable-buttons{ data: { "action": "close-reopen" } }
.clearfix.issue-btn-group.dropdown .clearfix.issue-btn-group.dropdown
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
= issuable_meta(@merge_request, @project, "Merge request") = issuable_meta(@merge_request, @project, "Merge request")
%a.btn.btn-default.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" } %a.btn.btn-default.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
= icon('angle-double-left') = sprite_icon('chevron-double-lg-left')
.detail-page-header-actions.js-issuable-actions .detail-page-header-actions.js-issuable-actions
.clearfix.issue-btn-group.dropdown .clearfix.issue-btn-group.dropdown
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.wiki-page-header.top-area.has-sidebar-toggle.py-3.flex-column.flex-lg-row .wiki-page-header.top-area.has-sidebar-toggle.py-3.flex-column.flex-lg-row
%button.btn.btn-default.d-block.d-sm-block.d-md-none.float-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } %button.btn.btn-default.d-block.d-sm-block.d-md-none.float-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left') = sprite_icon('chevron-double-lg-left')
.git-access-header.w-100.d-flex.flex-column.justify-content-center .git-access-header.w-100.d-flex.flex-column.justify-content-center
%span %span
......
%a.toggle-sidebar-button.js-toggle-sidebar.qa-toggle-sidebar.rspec-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" } %a.toggle-sidebar-button.js-toggle-sidebar.qa-toggle-sidebar.rspec-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" }
= sprite_icon('angle-double-left', css_class: 'icon-angle-double-left') = sprite_icon('chevron-double-lg-left', css_class: 'icon-chevron-double-lg-left')
= sprite_icon('angle-double-right', css_class: 'icon-angle-double-right') = sprite_icon('chevron-double-lg-right', css_class: 'icon-chevron-double-lg-right')
%span.collapse-text= _("Collapse sidebar") %span.collapse-text= _("Collapse sidebar")
= button_tag class: 'close-nav-button', type: 'button' do = button_tag class: 'close-nav-button', type: 'button' do
......
...@@ -33,4 +33,4 @@ ...@@ -33,4 +33,4 @@
= render 'shared/milestones/delete_button' = render 'shared/milestones/delete_button'
%button.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ type: 'button' } %button.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ type: 'button' }
= icon('angle-double-left') = sprite_icon('chevron-double-lg-left')
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.sidebar-container .sidebar-container
.block.wiki-sidebar-header.gl-mb-3.w-100 .block.wiki-sidebar-header.gl-mb-3.w-100
%a.gutter-toggle.float-right.d-block.d-sm-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" } %a.gutter-toggle.float-right.d-block.d-sm-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" }
= icon('angle-double-right') = sprite_icon('chevron-double-lg-right', size: 16, css_class: 'gl-icon')
- git_access_url = wiki_path(@wiki, action: :git_access) - git_access_url = wiki_path(@wiki, action: :git_access)
= link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '', data: { qa_selector: 'clone_repository_link' } do = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '', data: { qa_selector: 'clone_repository_link' } do
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left') = sprite_icon('chevron-double-lg-left')
.nav-text .nav-text
%h2.wiki-page-title %h2.wiki-page-title
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left') = sprite_icon('chevron-double-lg-left')
.nav-text .nav-text
%h2.wiki-page-title %h2.wiki-page-title
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left') = sprite_icon('chevron-double-lg-left')
.nav-text.flex-fill .nav-text.flex-fill
%h2.wiki-page-title{ data: { qa_selector: 'wiki_page_title' } }= @page.human_title %h2.wiki-page-title{ data: { qa_selector: 'wiki_page_title' } }= @page.human_title
......
---
title: Replace double angle icons with double chevron
merge_request: 34736
author:
type: other
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