From 706c5a1399c1c06a6a39a02e35d8e61f064632e8 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 27 Jun 2016 09:06:36 -0500
Subject: Switched mobile button icons to ellipsis and angle
---
CHANGELOG | 3 +++
app/assets/javascripts/application.js.coffee | 1 -
app/assets/stylesheets/framework/nav.scss | 5 ++---
app/views/layouts/header/_default.html.haml | 2 +-
app/views/layouts/nav/_admin.html.haml | 4 ++--
app/views/layouts/nav/_group.html.haml | 4 ++--
app/views/layouts/nav/_profile.html.haml | 4 ++--
app/views/layouts/nav/_project.html.haml | 4 ++--
app/views/projects/commits/_head.html.haml | 4 ++--
9 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 02364aaed0f..bfe8c8717ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,9 @@ v 8.9.2
- Fix an information disclosure when requesting access to a group containing private projects.
- Update omniauth-saml to 1.6.0 !4951
+v 8.9.1
+ - Update mobile button icons to be more inline with typical UI paradigms
+
v 8.9.1
- Refactor labels documentation. !3347
- Eager load award emoji on notes. !4628
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 2c515dced08..b6dbf2d0cc1 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -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) ->
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 6211bc04597..6e5f216c894 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -21,9 +21,8 @@
.fa {
position: relative;
- top: 3px;
- font-size: 13px;
- color: $btn-placeholder-gray;
+ top: 5px;
+ font-size: 18px;
}
}
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 40a2c81eebd..1a39572ac3c 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -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
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 0f264cd2e06..a7415507c8f 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -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
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 5d657a9ac84..d7d36c84b6c 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -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
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index f37f9b0f5a3..96fe62c39c3 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -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
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index a4bb56aa56f..dcef427cda3 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -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
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index b11b6c24ccd..61152649907 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -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
--
cgit v1.2.1
From ca92ad90438d3a9217ae7bf282423af6da7c2168 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 27 Jun 2016 17:36:01 -0500
Subject: Update CHANGELOG
---
CHANGELOG | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index bfe8c8717ae..15d247ded95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,15 +19,14 @@ 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.
- Fix an information disclosure when requesting access to a group containing private projects.
- Update omniauth-saml to 1.6.0 !4951
-v 8.9.1
- - Update mobile button icons to be more inline with typical UI paradigms
-
v 8.9.1
- Refactor labels documentation. !3347
- Eager load award emoji on notes. !4628
--
cgit v1.2.1