From 87346bfe6de362b832e27c75f3e9b1def2ef1f11 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Tue, 31 Jan 2017 10:04:29 -0600
Subject: [PATCH] Remove settings cog from within admin scroll tabs; keep links
centered
---
app/assets/stylesheets/framework/nav.scss | 1 -
app/views/layouts/nav/_admin.html.haml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index adbc141262e..fd081c2d7e1 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -297,7 +297,6 @@
.nav-control {
@media (max-width: $screen-sm-max) {
- text-align: left;
margin-right: 75px;
}
}
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index ac04f57e217..19a947af4ca 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,5 +1,5 @@
+= render 'layouts/nav/admin_settings'
.scrolling-tabs-container{ class: nav_control_class }
- = render 'layouts/nav/admin_settings'
.fade-left
= icon('angle-left')
.fade-right
--
GitLab