mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-10 05:06:46 +10:00
Merge branch '19170-mobile-buttons' into 'master'
Switched mobile button icons to ellipsis and angle ## What does this MR do? Switches the mobile button icons ## What are the relevant issue numbers? Closes #19170 Part of #19200 ## Screenshots (if relevant)  See merge request !4944
This commit is contained in:
@@ -19,6 +19,8 @@ v 8.10.0 (unreleased)
|
||||
v 8.9.3 (unreleased)
|
||||
- Decreased min width of screen to 1280px for pinned sidebar
|
||||
- Fix encrypted data backwards compatibility after upgrading attr_encrypted gem
|
||||
v 8.9.3
|
||||
- Update mobile button icons to be more inline with typical UI paradigms
|
||||
|
||||
v 8.9.2
|
||||
- Fix visibility of snippets when searching.
|
||||
|
||||
@@ -199,7 +199,6 @@ $ ->
|
||||
$('.header-content .header-logo').toggle()
|
||||
$('.header-content .navbar-collapse').toggle()
|
||||
$('.navbar-toggle').toggleClass('active')
|
||||
$('.navbar-toggle i').toggleClass("fa-angle-right fa-angle-left")
|
||||
|
||||
# Show/hide comments on diff
|
||||
$body.on "click", ".js-toggle-diff-comments", (e) ->
|
||||
|
||||
@@ -21,9 +21,8 @@
|
||||
|
||||
.fa {
|
||||
position: relative;
|
||||
top: 3px;
|
||||
font-size: 13px;
|
||||
color: $btn-placeholder-gray;
|
||||
top: 5px;
|
||||
font-size: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
= icon('bars')
|
||||
%button.navbar-toggle{type: 'button'}
|
||||
%span.sr-only Toggle navigation
|
||||
= icon('angle-left')
|
||||
= icon('ellipsis-v')
|
||||
|
||||
.navbar-collapse.collapse
|
||||
%ul.nav.navbar-nav
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
.scrolling-tabs-container{ class: nav_control_class }
|
||||
= render 'layouts/nav/admin_settings'
|
||||
.fade-left
|
||||
= icon('arrow-left')
|
||||
= icon('angle-left')
|
||||
.fade-right
|
||||
= icon('arrow-right')
|
||||
= icon('angle-right')
|
||||
%ul.nav-links.scrolling-tabs
|
||||
= nav_link(controller: %w(dashboard admin projects users groups builds runners), html_options: {class: 'home'}) do
|
||||
= link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
.scrolling-tabs-container{ class: nav_control_class }
|
||||
= render 'layouts/nav/group_settings'
|
||||
.fade-left
|
||||
= icon('arrow-left')
|
||||
= icon('angle-left')
|
||||
.fade-right
|
||||
= icon('arrow-right')
|
||||
= icon('angle-right')
|
||||
%ul.nav-links.scrolling-tabs
|
||||
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do
|
||||
= link_to group_path(@group), title: 'Home' do
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
.scrolling-tabs-container
|
||||
.fade-left
|
||||
= icon('arrow-left')
|
||||
= icon('angle-left')
|
||||
.fade-right
|
||||
= icon('arrow-right')
|
||||
= icon('angle-right')
|
||||
%ul.nav-links.scrolling-tabs
|
||||
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
|
||||
= link_to profile_path, title: 'Profile Settings' do
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
|
||||
.scrolling-tabs-container{ class: nav_control_class }
|
||||
.fade-left
|
||||
= icon('arrow-left')
|
||||
= icon('angle-left')
|
||||
.fade-right
|
||||
= icon('arrow-right')
|
||||
= icon('angle-right')
|
||||
%ul.nav-links.scrolling-tabs
|
||||
= nav_link(path: 'projects#show', html_options: {class: 'home'}) do
|
||||
= link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
.scrolling-tabs-container.sub-nav-scroll
|
||||
.fade-left
|
||||
= icon('arrow-left')
|
||||
= icon('angle-left')
|
||||
.fade-right
|
||||
= icon('arrow-right')
|
||||
= icon('angle-right')
|
||||
.nav-links.sub-nav.scrolling-tabs
|
||||
%ul{ class: (container_class) }
|
||||
= nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
|
||||
|
||||
Reference in New Issue
Block a user