BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
8eb31c40
Commit
8eb31c40
authored
May 09, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide navbar on mobile
parent
618033fb
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
95 additions
and
6 deletions
+95
-6
application.js.coffee
app/assets/javascripts/application.js.coffee
+1
-0
sidebar.js.coffee
app/assets/javascripts/sidebar.js.coffee
+1
-1
header.scss
app/assets/stylesheets/framework/header.scss
+47
-3
sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+40
-0
variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
profile.scss
app/assets/stylesheets/pages/profile.scss
+1
-1
_default.html.haml
app/views/layouts/header/_default.html.haml
+4
-1
No files found.
app/assets/javascripts/application.js.coffee
View file @
8eb31c40
...
...
@@ -204,6 +204,7 @@ $ ->
$
(
'.header-content .title'
).
toggle
()
$
(
'.header-content .navbar-collapse'
).
toggle
()
$
(
'.navbar-toggle'
).
toggleClass
(
'active'
)
$
(
'.navbar-toggle i'
).
toggleClass
(
"fa-angle-right fa-angle-left"
)
# Show/hide comments on diff
$
(
"body"
).
on
"click"
,
".js-toggle-diff-comments"
,
(
e
)
->
...
...
app/assets/javascripts/sidebar.js.coffee
View file @
8eb31c40
...
...
@@ -12,7 +12,7 @@ toggleSidebar = ->
niceScrollBars
.
updateScrollBar
();
),
300
$
(
document
).
on
(
"click"
,
'.toggle-nav-collapse'
,
(
e
)
->
$
(
document
).
on
(
"click"
,
'.toggle-nav-collapse
, .side-nav-toggle
'
,
(
e
)
->
e
.
preventDefault
()
toggleSidebar
()
...
...
app/assets/stylesheets/framework/header.scss
View file @
8eb31c40
...
...
@@ -8,7 +8,7 @@ header {
&
.navbar-empty
{
height
:
58px
;
background
:
#fff
;
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
$btn-gray-hover
;
.center-logo
{
margin
:
11px
0
;
...
...
@@ -30,6 +30,10 @@ header {
border
:
none
;
border-bottom
:
1px
solid
$border-color
;
@media
(
max-width
:
$screen-xs-min
)
{
padding
:
0
16px
;
}
&
.with-horizontal-nav
{
border-bottom
:
none
;
}
...
...
@@ -60,16 +64,44 @@ header {
margin
:
6px
0
;
border-radius
:
0
;
position
:
absolute
;
right
:
2px
;
right
:
-10px
;
padding
:
6px
10px
;
&
:hover
{
background-color
:
#eee
;
background-color
:
$btn-gray-hover
;
}
&
.active
{
color
:
$gl-icon-color
;
}
}
}
&
.header-collapsed
{
padding
:
0
16px
;
}
.side-nav-toggle
{
display
:
none
;
position
:
absolute
;
left
:
-10px
;
margin
:
6px
0
;
padding
:
6px
10px
;
border
:
none
;
background-color
:
$background-color
;
&
:hover
{
background-color
:
$btn-gray-hover
;
}
&
:focus
{
outline
:
none
;
}
@media
(
max-width
:
$screen-xs-min
)
{
display
:
block
;
}
}
}
.header-content
{
...
...
@@ -77,6 +109,10 @@ header {
height
:
$header-height
;
padding-right
:
40px
;
@media
(
max-width
:
$screen-xs-min
)
{
padding-left
:
40px
;
}
@media
(
min-width
:
$screen-sm-min
)
{
padding-right
:
0
;
}
...
...
@@ -145,6 +181,10 @@ header {
@media
(
min-width
:
$screen-md-min
)
{
@include
collapsed-header
;
}
@media
(
max-width
:
$screen-xs-min
)
{
margin-left
:
0
;
}
}
.header-expanded
{
...
...
@@ -153,6 +193,10 @@ header {
@media
(
min-width
:
$screen-md-min
)
{
margin-left
:
$sidebar_width
;
}
@media
(
max-width
:
$screen-xs-min
)
{
margin-left
:
0
;
}
}
@media
(
max-width
:
$screen-xs-max
)
{
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
8eb31c40
...
...
@@ -210,15 +210,33 @@
}
}
.sidebar-wrapper
{
&
.hidden-nav
{
width
:
0
;
}
}
.page-sidebar-collapsed
{
padding-left
:
$sidebar_collapsed_width
;
@media
(
max-width
:
$screen-xs-min
)
{
padding-left
:
0
;
}
.sidebar-wrapper
{
width
:
$sidebar_collapsed_width
;
@media
(
max-width
:
$screen-xs-min
)
{
width
:
0
;
}
.header-logo
{
width
:
$sidebar_collapsed_width
;
@media
(
max-width
:
$screen-xs-min
)
{
width
:
0
;
}
a
{
padding-left
:
(
$sidebar_collapsed_width
-
36
)
/
2
;
...
...
@@ -244,12 +262,22 @@
.collapse-nav
a
{
width
:
$sidebar_collapsed_width
;
@media
(
max-width
:
$screen-xs-min
)
{
width
:
0
;
}
}
.sidebar-user
{
padding-left
:
(
$sidebar_collapsed_width
-
36
)
/
2
;
width
:
$sidebar_collapsed_width
;
@media
(
max-width
:
$screen-xs-min
)
{
width
:
0
;
padding-left
:
0
;
padding-right
:
0
;
}
.username
{
display
:
none
;
}
...
...
@@ -258,6 +286,10 @@
.layout-nav
{
padding-right
:
$sidebar_collapsed_width
;
@media
(
max-width
:
$screen-xs-min
)
{
padding-right
:
0
;;
}
}
}
...
...
@@ -268,6 +300,10 @@
padding-left
:
$sidebar_width
;
}
@media
(
max-width
:
$screen-xs-min
)
{
padding-left
:
0
;
}
.sidebar-wrapper
{
width
:
$sidebar_width
;
...
...
@@ -288,6 +324,10 @@
.layout-nav
{
padding-right
:
$sidebar_width
;
@media
(
max-width
:
$screen-xs-min
)
{
padding-right
:
0
;;
}
}
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
8eb31c40
...
...
@@ -215,6 +215,7 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
$btn-active-gray
:
#ececec
;
$btn-placeholder-gray
:
#c7c7c7
;
$btn-white-active
:
#848484
;
$btn-gray-hover
:
#eee
;
/*
* Award emoji
...
...
app/assets/stylesheets/pages/profile.scss
View file @
8eb31c40
...
...
@@ -218,7 +218,7 @@
.btn
{
display
:
inline-block
;
width
:
4
8
%
;
width
:
4
6
%
;
}
}
}
...
...
app/views/layouts/header/_default.html.haml
View file @
8eb31c40
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
%div
{
class:
fluid_layout
?
"container-fluid"
:
"container-fluid"
}
.header-content
%button
.
navbar
-toggle
{
type:
'button'
}
%button
.
side-nav
-toggle
{
type:
'button'
}
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
%button
.navbar-toggle
{
type:
'button'
}
%span
.sr-only
Toggle navigation
=
icon
(
'angle-left'
)
.navbar-collapse.collapse
%ul
.nav.navbar-nav
...
...
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