Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
16b1d3a3
Commit
16b1d3a3
authored
May 13, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mobile dropdown bug
parent
c37006fa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
2 deletions
+29
-2
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+19
-0
app/helpers/nav_helper.rb
app/helpers/nav_helper.rb
+8
-0
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
app/views/layouts/nav/_group_settings.html.haml
app/views/layouts/nav/_group_settings.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
16b1d3a3
...
...
@@ -209,6 +209,15 @@
float
:
right
;
padding
:
7px
0
0
;
@media
(
max-width
:
$screen-xs-min
)
{
float
:
none
;
padding
:
0
9px
;
.dropdown-new
{
width
:
100%
;
}
}
i
{
color
:
$layout-link-gray
;
}
...
...
@@ -225,6 +234,10 @@
.dropdown
{
margin-left
:
7px
;
@media
(
max-width
:
$screen-xs-min
)
{
margin-left
:
0
;
}
}
}
...
...
@@ -260,4 +273,10 @@
.page-with-layout-nav
{
margin-top
:
50px
;
&
.controls-dropdown-visible
{
@media
(
max-width
:
$screen-xs-min
)
{
margin-top
:
96px
;
}
}
}
app/helpers/nav_helper.rb
View file @
16b1d3a3
...
...
@@ -43,4 +43,12 @@ module NavHelper
class_name
+=
" with-horizontal-nav"
if
defined?
(
nav
)
&&
nav
class_name
end
def
layout_nav_class
"page-with-layout-nav"
if
defined?
(
nav
)
&&
nav
end
def
layout_dropdown_class
"controls-dropdown-visible"
if
current_user
end
end
app/views/layouts/_page.html.haml
View file @
16b1d3a3
...
...
@@ -25,7 +25,7 @@
.layout-nav
.container-fluid
=
render
"layouts/nav/
#{
nav
}
"
.content-wrapper
{
class:
(
'page-with-layout-nav'
if
defined?
(
nav
)
&&
nav
)
}
.content-wrapper
{
class:
"#{layout_nav_class} #{layout_dropdown_class}"
}
=
render
"layouts/broadcast"
=
render
"layouts/flash"
=
yield
:flash_message
...
...
app/views/layouts/nav/_group_settings.html.haml
View file @
16b1d3a3
-
if
current_user
-
if
access
=
@group
.
users
.
find_by
(
id:
current_user
.
id
)
.controls
%span
.dropdown.group-settings-dropdown
.dropdown.group-settings-dropdown
%a
.dropdown-new.btn.btn-default
#group-settings-button
{
href:
'#'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
'cog'
)
=
icon
(
'caret-down'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment