BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit df1500b3 by Annabel Dunstone Gray Committed by James Lopez
Options

Merge branch '19164-mobile-settings' into 'master'

19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
parent 1b53ed13
Showing with 12 additions and 5 deletions
app/assets/stylesheets/framework/nav.scss
...@@ -294,16 +294,18 @@ ...@@ -294,16 +294,18 @@
.container-fluid { .container-fluid {
position: relative; position: relative;
.nav-control {
@media (max-width: $screen-sm-max) {
margin-right: 75px;
}
}
} }
.controls { .controls {
float: right; float: right;
padding: 7px 0 0; padding: 7px 0 0;
@media (max-width: $screen-sm-max) {
display: none;
}
i { i {
color: $layout-link-gray; color: $layout-link-gray;
} }
...@@ -361,6 +363,7 @@ ...@@ -361,6 +363,7 @@
.fade-left { .fade-left {
@include fade(right, $gray-light); @include fade(right, $gray-light);
left: -5px; left: -5px;
text-align: center;
.fa { .fa {
left: -7px; left: -7px;
......
app/views/layouts/nav/_admin.html.haml
= render 'layouts/nav/admin_settings'
.scrolling-tabs-container{ class: nav_control_class } .scrolling-tabs-container{ class: nav_control_class }
= render 'layouts/nav/admin_settings'
.fade-left .fade-left
= icon('angle-left') = icon('angle-left')
.fade-right .fade-right
......
changelogs/unreleased/19164-mobile-settings.yml 0 → 100644
---
title: 19164 Add settings dropdown to mobile screens
merge_request:
author:
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