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
9d6e0c50
Commit
9d6e0c50
authored
Mar 04, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Left sidebar overlaps the content on mobile devices
parent
37ba5a12
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
11 deletions
+24
-11
app/assets/javascripts/sidebar.js.coffee
app/assets/javascripts/sidebar.js.coffee
+13
-4
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+5
-5
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+6
-2
No files found.
app/assets/javascripts/sidebar.js.coffee
View file @
9d6e0c50
$
(
document
).
on
(
"click"
,
'.toggle-nav-collapse'
,
(
e
)
->
mobileWidth
=
768
e
.
preventDefault
()
collapsed
=
'page-sidebar-collapsed'
collapsed
=
'page-sidebar-collapsed'
expanded
=
'page-sidebar-expanded'
expanded
=
'page-sidebar-expanded'
toggleSidebar
=
->
$
(
'.page-with-sidebar'
).
toggleClass
(
"
#{
collapsed
}
#{
expanded
}
"
)
$
(
'.page-with-sidebar'
).
toggleClass
(
"
#{
collapsed
}
#{
expanded
}
"
)
$
(
'header'
).
toggleClass
(
"header-collapsed header-expanded"
)
$
(
'header'
).
toggleClass
(
"header-collapsed header-expanded"
)
$
(
'.sidebar-wrapper'
).
toggleClass
(
"sidebar-collapsed sidebar-expanded"
)
$
(
'.sidebar-wrapper'
).
toggleClass
(
"sidebar-collapsed sidebar-expanded"
)
...
@@ -14,4 +14,13 @@ $(document).on("click", '.toggle-nav-collapse', (e) ->
...
@@ -14,4 +14,13 @@ $(document).on("click", '.toggle-nav-collapse', (e) ->
niceScrollBars
.
updateScrollBar
();
niceScrollBars
.
updateScrollBar
();
),
300
),
300
$
(
document
).
on
(
"click"
,
'.toggle-nav-collapse'
,
(
e
)
->
e
.
preventDefault
()
toggleSidebar
()
)
)
$
(
document
).
ready
->
if
$
(
window
).
width
()
<
mobileWidth
if
$
(
'.page-with-sidebar'
).
hasClass
(
expanded
)
toggleSidebar
()
app/assets/stylesheets/framework/header.scss
View file @
9d6e0c50
...
@@ -141,17 +141,17 @@ header {
...
@@ -141,17 +141,17 @@ header {
margin-left
:
$sidebar_collapsed_width
;
margin-left
:
$sidebar_collapsed_width
;
}
}
@media
(
max-width
:
$screen-
md-max
)
{
@media
(
max-width
:
$screen-
sm
)
{
.header-collapsed
{
.header-collapsed
{
margin-left
:
$sidebar_collapsed_width
;
margin-left
:
$sidebar_collapsed_width
;
}
}
.header-expanded
{
.header-expanded
{
margin-left
:
$sidebar_width
;
margin-left
:
$sidebar_
collapsed_
width
;
}
}
}
}
@media
(
min-width
:
$screen-
md-max
)
{
@media
(
min-width
:
$screen-
sm
)
{
.header-collapsed
{
.header-collapsed
{
@include
collapsed-header
;
@include
collapsed-header
;
}
}
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
9d6e0c50
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
}
}
.sidebar-wrapper
{
.sidebar-wrapper
{
z-index
:
99
;
z-index
:
99
9
;
background
:
$background-color
;
background
:
$background-color
;
}
}
...
@@ -203,7 +203,11 @@
...
@@ -203,7 +203,11 @@
}
}
@mixin
expanded-sidebar
{
@mixin
expanded-sidebar
{
padding-left
:
$sidebar_width
;
padding-left
:
$sidebar_collapsed_width
;
@media
(
min-width
:
$screen-sm-min
)
{
padding-left
:
$sidebar_width
;
}
&
.right-sidebar-collapsed
{
&
.right-sidebar-collapsed
{
/* Extra small devices (phones, less than 768px) */
/* Extra small devices (phones, less than 768px) */
...
...
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