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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
01f6ae23
Commit
01f6ae23
authored
Jun 01, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve navbar collapse for mobile views
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a74dfa6e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
13 deletions
+10
-13
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+4
-0
app/assets/stylesheets/generic/header.scss
app/assets/stylesheets/generic/header.scss
+4
-11
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+2
-2
No files found.
app/assets/javascripts/application.js.coffee
View file @
01f6ae23
...
@@ -177,6 +177,10 @@ $ ->
...
@@ -177,6 +177,10 @@ $ ->
$
(
@
).
next
(
'table'
).
show
()
$
(
@
).
next
(
'table'
).
show
()
$
(
@
).
remove
()
$
(
@
).
remove
()
$
(
'.navbar-toggle'
).
on
'click'
,
->
$
(
'.header-content .title'
).
toggle
()
$
(
'.header-content .navbar-collapse'
).
toggle
()
# Show/hide comments on diff
# Show/hide comments on diff
$
(
"body"
).
on
"click"
,
".js-toggle-diff-comments"
,
(
e
)
->
$
(
"body"
).
on
"click"
,
".js-toggle-diff-comments"
,
(
e
)
->
$
(
@
).
toggleClass
(
'active'
)
$
(
@
).
toggleClass
(
'active'
)
...
...
app/assets/stylesheets/generic/header.scss
View file @
01f6ae23
...
@@ -42,15 +42,12 @@ header {
...
@@ -42,15 +42,12 @@ header {
}
}
}
}
.nav
{
float
:
right
;
margin-right
:
0
;
}
.navbar-toggle
{
.navbar-toggle
{
color
:
#666
;
color
:
#666
;
margin
:
0
;
margin
:
0
;
border-radius
:
0
;
border-radius
:
0
;
position
:
absolute
;
right
:
2px
;
&
:hover
{
&
:hover
{
background-color
:
#EEE
;
background-color
:
#EEE
;
...
@@ -195,7 +192,8 @@ header {
...
@@ -195,7 +192,8 @@ header {
}
}
.navbar-nav
{
.navbar-nav
{
margin
:
5px
0
;
margin
:
0px
;
float
:
none
!
important
;
.visible-xs
,
.visable-sm
{
.visible-xs
,
.visable-sm
{
display
:
table-cell
!
important
;
display
:
table-cell
!
important
;
...
@@ -205,11 +203,6 @@ header {
...
@@ -205,11 +203,6 @@ header {
li
{
li
{
display
:
table-cell
;
display
:
table-cell
;
width
:
1%
;
width
:
1%
;
a
{
text-align
:
center
;
font-size
:
18px
!
important
;
}
}
}
}
}
}
}
app/views/layouts/header/_default.html.haml
View file @
01f6ae23
...
@@ -8,12 +8,12 @@
...
@@ -8,12 +8,12 @@
%h1
.title
%h1
.title
=
title
=
title
%button
.navbar-toggle
{
type:
'button'
,
data:
{
target:
'.navbar-collapse'
,
toggle:
'collapse'
}}
%button
.navbar-toggle
%span
.sr-only
Toggle navigation
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
=
icon
(
'bars'
)
.navbar-collapse.collapse
.navbar-collapse.collapse
%ul
.nav.navbar-nav
%ul
.nav.navbar-nav
.pull-right
%li
.hidden-sm.hidden-xs
%li
.hidden-sm.hidden-xs
=
render
'layouts/search'
=
render
'layouts/search'
%li
.visible-sm.visible-xs
%li
.visible-sm.visible-xs
...
...
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