kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

19164 Add settings dropdown to mobile screens

Closes #19164

See merge request !8896
This commit is contained in:
Annabel Dunstone Gray 2017-01-31 21:02:57 +00:00
parent 43c575acf3 87346bfe6d
commit 577bb4ebe8
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/stylesheets/framework/nav.scss
View File

@ -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 @@
.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;

2
app/views/layouts/nav/_admin.html.haml
View File

@ -1,5 +1,5 @@
= 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

4
changelogs/unreleased/19164-mobile-settings.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: 19164 Add settings dropdown to mobile screens
merge_request:
author: