Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
b711e100
Commit
b711e100
authored
Jul 19, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix JS; make buttons sr accessibile; fix overlay
parent
49ee81ca
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
24 additions
and
15 deletions
+24
-15
app/assets/javascripts/layout_nav.js
app/assets/javascripts/layout_nav.js
+6
-2
app/assets/javascripts/new_sidebar.js
app/assets/javascripts/new_sidebar.js
+3
-3
app/assets/stylesheets/new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+1
-1
app/views/layouts/nav/_breadcrumbs.html.haml
app/views/layouts/nav/_breadcrumbs.html.haml
+2
-1
app/views/layouts/nav/_new_admin_sidebar.html.haml
app/views/layouts/nav/_new_admin_sidebar.html.haml
+3
-2
app/views/layouts/nav/_new_group_sidebar.html.haml
app/views/layouts/nav/_new_group_sidebar.html.haml
+3
-2
app/views/layouts/nav/_new_profile_sidebar.html.haml
app/views/layouts/nav/_new_profile_sidebar.html.haml
+3
-2
app/views/layouts/nav/_new_project_sidebar.html.haml
app/views/layouts/nav/_new_project_sidebar.html.haml
+3
-2
No files found.
app/assets/javascripts/layout_nav.js
View file @
b711e100
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, no-unused-vars, one-var, one-var-declaration-per-line, vars-on-top, max-len */
import
_
from
'
underscore
'
;
import
Cookies
from
'
js-cookie
'
;
import
NewNavSidebar
from
'
./new_sidebar
'
;
(
function
()
{
...
...
@@ -54,8 +55,11 @@ import NewNavSidebar from './new_sidebar';
}
$
(()
=>
{
var
newNavSidebar
=
new
NewNavSidebar
();
newNavSidebar
.
bindEvents
();
if
(
Cookies
.
get
(
'
new_nav
'
)
===
'
true
'
)
{
const
newNavSidebar
=
new
NewNavSidebar
();
newNavSidebar
.
bindEvents
();
}
$
(
window
).
on
(
'
scroll
'
,
_
.
throttle
(
applyScrollNavClass
,
100
));
});
}).
call
(
window
);
app/assets/javascripts/new_sidebar.js
View file @
b711e100
...
...
@@ -11,9 +11,9 @@ export default class NewNavSidebar {
}
bindEvents
()
{
this
.
$openSidebar
.
on
(
'
click
'
,
e
=>
this
.
toggleSidebarNav
(
e
,
true
));
this
.
$closeSidebar
.
on
(
'
click
'
,
e
=>
this
.
toggleSidebarNav
(
e
,
false
));
this
.
$overlay
.
on
(
'
click
'
,
e
=>
this
.
toggleSidebarNav
(
e
,
false
));
this
.
$openSidebar
.
on
(
'
click
'
,
()
=>
this
.
toggleSidebarNav
(
true
));
this
.
$closeSidebar
.
on
(
'
click
'
,
()
=>
this
.
toggleSidebarNav
(
false
));
this
.
$overlay
.
on
(
'
click
'
,
()
=>
this
.
toggleSidebarNav
(
false
));
}
toggleSidebarNav
(
show
)
{
...
...
app/assets/stylesheets/new_sidebar.scss
View file @
b711e100
...
...
@@ -247,7 +247,7 @@ $new-sidebar-width: 220px;
&
.mobile-nav-open
{
display
:
block
;
position
:
absolute
;
position
:
fixed
;
background-color
:
$black-transparent
;
height
:
100%
;
width
:
100%
;
...
...
app/views/layouts/nav/_breadcrumbs.html.haml
View file @
b711e100
...
...
@@ -4,7 +4,8 @@
%nav
.breadcrumbs
{
role:
"navigation"
}
.breadcrumbs-container
{
class:
[
container_class
,
@content_class
]
}
-
if
defined?
(
@new_sidebar
)
%button
.toggle-mobile-nav
=
button_tag
class:
'toggle-mobile-nav'
,
type:
'button'
do
%span
.sr-only
Open sidebar
=
icon
(
'bars'
)
.breadcrumbs-links.js-title-container
-
unless
hide_top_links
...
...
app/views/layouts/nav/_new_admin_sidebar.html.haml
View file @
b711e100
...
...
@@ -4,8 +4,9 @@
.avatar-container.s40.settings-avatar
=
icon
(
'wrench'
)
.project-title
Admin Area
%button
.close-nav-button
=
icon
(
'times'
)
=
button_tag
class:
'close-nav-button'
,
type:
'button'
do
%span
.sr-only
Close sidebar
=
icon
(
'times'
)
%ul
.sidebar-top-level-items
=
nav_link
(
controller:
%w(dashboard admin projects users groups jobs runners cohorts)
,
html_options:
{
class:
'home'
})
do
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
...
...
app/views/layouts/nav/_new_group_sidebar.html.haml
View file @
b711e100
...
...
@@ -5,8 +5,9 @@
=
image_tag
group_icon
(
@group
),
class:
"avatar s40 avatar-tile"
.group-title
=
@group
.
name
%button
.close-nav-button
=
icon
(
'times'
)
=
button_tag
class:
'close-nav-button'
,
type:
'button'
do
%span
.sr-only
Close sidebar
=
icon
(
'times'
)
%ul
.sidebar-top-level-items
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'groups#subgroups'
],
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
...
...
app/views/layouts/nav/_new_profile_sidebar.html.haml
View file @
b711e100
...
...
@@ -4,8 +4,9 @@
.avatar-container.s40.settings-avatar
=
icon
(
'user'
)
.project-title
User Settings
%button
.close-nav-button
=
icon
(
'times'
)
=
button_tag
class:
'close-nav-button'
,
type:
'button'
do
%span
.sr-only
Close sidebar
=
icon
(
'times'
)
%ul
.sidebar-top-level-items
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
...
...
app/views/layouts/nav/_new_project_sidebar.html.haml
View file @
b711e100
...
...
@@ -6,8 +6,9 @@
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'avatar s40 avatar-tile'
)
.project-title
=
@project
.
name
%button
.close-nav-button
=
icon
(
'times'
)
=
button_tag
class:
'close-nav-button'
,
type:
'button'
do
%span
.sr-only
Close sidebar
=
icon
(
'times'
)
%ul
.sidebar-top-level-items
=
nav_link
(
path:
[
'projects#show'
,
'projects#activity'
,
'cycle_analytics#show'
],
html_options:
{
class:
'home'
})
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
...
...
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