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
2414d941
Commit
2414d941
authored
Sep 19, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused admin subnavs
parent
80471444
Changes
17
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
36 additions
and
110 deletions
+36
-110
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+36
-0
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+0
-34
app/views/admin/background_jobs/show.html.haml
app/views/admin/background_jobs/show.html.haml
+0
-1
app/views/admin/cohorts/index.html.haml
app/views/admin/cohorts/index.html.haml
+0
-1
app/views/admin/conversational_development_index/show.html.haml
...ews/admin/conversational_development_index/show.html.haml
+0
-2
app/views/admin/dashboard/_head.html.haml
app/views/admin/dashboard/_head.html.haml
+0
-37
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+0
-1
app/views/admin/groups/index.html.haml
app/views/admin/groups/index.html.haml
+0
-1
app/views/admin/health_check/show.html.haml
app/views/admin/health_check/show.html.haml
+0
-1
app/views/admin/jobs/index.html.haml
app/views/admin/jobs/index.html.haml
+0
-1
app/views/admin/logs/show.html.haml
app/views/admin/logs/show.html.haml
+0
-1
app/views/admin/monitoring/_head.html.haml
app/views/admin/monitoring/_head.html.haml
+0
-25
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+0
-1
app/views/admin/requests_profiles/index.html.haml
app/views/admin/requests_profiles/index.html.haml
+0
-1
app/views/admin/runners/index.html.haml
app/views/admin/runners/index.html.haml
+0
-1
app/views/admin/system_info/show.html.haml
app/views/admin/system_info/show.html.haml
+0
-1
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+0
-1
No files found.
app/assets/stylesheets/framework/mixins.scss
View file @
2414d941
...
@@ -144,3 +144,39 @@
...
@@ -144,3 +144,39 @@
@mixin
green-status-color
{
@mixin
green-status-color
{
@include
status-color
(
$green-50
,
$green-500
,
$green-700
);
@include
status-color
(
$green-50
,
$green-500
,
$green-700
);
}
}
@mixin
fade
(
$gradient-direction
,
$gradient-color
)
{
visibility
:
hidden
;
opacity
:
0
;
z-index
:
2
;
position
:
absolute
;
bottom
:
12px
;
width
:
43px
;
height
:
30px
;
transition-duration
:
.3s
;
-webkit-transform
:
translateZ
(
0
);
background
:
linear-gradient
(
to
$gradient-direction
,
$gradient-color
45%
,
rgba
(
$gradient-color
,
0
.4
));
&
.scrolling
{
visibility
:
visible
;
opacity
:
1
;
transition-duration
:
.3s
;
}
.fa
{
position
:
relative
;
top
:
5px
;
font-size
:
18px
;
}
}
@mixin
scrolling-links
()
{
overflow-x
:
auto
;
overflow-y
:
hidden
;
-webkit-overflow-scrolling
:
touch
;
display
:
flex
;
&
:
:-
webkit-scrollbar
{
display
:
none
;
}
}
app/assets/stylesheets/framework/nav.scss
View file @
2414d941
@mixin
fade
(
$gradient-direction
,
$gradient-color
)
{
visibility
:
hidden
;
opacity
:
0
;
z-index
:
2
;
position
:
absolute
;
bottom
:
12px
;
width
:
43px
;
height
:
30px
;
transition-duration
:
.3s
;
-webkit-transform
:
translateZ
(
0
);
background
:
linear-gradient
(
to
$gradient-direction
,
$gradient-color
45%
,
rgba
(
$gradient-color
,
0
.4
));
&
.scrolling
{
visibility
:
visible
;
opacity
:
1
;
transition-duration
:
.3s
;
}
.fa
{
position
:
relative
;
top
:
5px
;
font-size
:
18px
;
}
}
@mixin
scrolling-links
()
{
overflow-x
:
auto
;
overflow-y
:
hidden
;
-webkit-overflow-scrolling
:
touch
;
display
:
flex
;
&
:
:-
webkit-scrollbar
{
display
:
none
;
}
}
.nav-links
{
.nav-links
{
display
:
flex
;
display
:
flex
;
...
...
app/views/admin/background_jobs/show.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
page_title
"Background Jobs"
-
page_title
"Background Jobs"
=
render
'admin/monitoring/head'
%div
{
class:
container_class
}
%div
{
class:
container_class
}
%h3
.page-title
Background Jobs
%h3
.page-title
Background Jobs
...
...
app/views/admin/cohorts/index.html.haml
View file @
2414d941
-
breadcrumb_title
"Cohorts"
-
breadcrumb_title
"Cohorts"
-
@no_container
=
true
-
@no_container
=
true
=
render
"admin/dashboard/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
-
if
@cohorts
-
if
@cohorts
...
...
app/views/admin/conversational_development_index/show.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
page_title
'ConvDev Index'
-
page_title
'ConvDev Index'
=
render
'admin/monitoring/head'
.container
.container
-
if
show_callout?
(
'convdev_intro_callout_dismissed'
)
-
if
show_callout?
(
'convdev_intro_callout_dismissed'
)
=
render
'callout'
=
render
'callout'
...
...
app/views/admin/dashboard/_head.html.haml
deleted
100644 → 0
View file @
80471444
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
(
container_class
)
}
=
nav_link
(
controller: :dashboard
,
html_options:
{
class:
'home'
})
do
=
link_to
admin_root_path
,
title:
'Overview'
do
%span
Overview
=
nav_link
(
controller:
[
:admin
,
:projects
])
do
=
link_to
admin_projects_path
,
title:
'Projects'
do
%span
Projects
=
nav_link
(
controller: :users
)
do
=
link_to
admin_users_path
,
title:
'Users'
do
%span
Users
=
nav_link
(
controller: :groups
)
do
=
link_to
admin_groups_path
,
title:
'Groups'
do
%span
Groups
=
nav_link
path:
'builds#index'
do
=
link_to
admin_jobs_path
,
title:
'Jobs'
do
%span
Jobs
=
nav_link
path:
[
'runners#index'
,
'runners#show'
]
do
=
link_to
admin_runners_path
,
title:
'Runners'
do
%span
Runners
=
nav_link
path:
'cohorts#index'
do
=
link_to
admin_cohorts_path
,
title:
'Cohorts'
do
%span
Cohorts
=
nav_link
(
controller: :conversational_development_index
)
do
=
link_to
admin_conversational_development_index_path
,
title:
'ConvDev Index'
do
%span
ConvDev Index
app/views/admin/dashboard/index.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
breadcrumb_title
"Dashboard"
-
breadcrumb_title
"Dashboard"
=
render
"admin/dashboard/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.admin-dashboard.prepend-top-default
.admin-dashboard.prepend-top-default
...
...
app/views/admin/groups/index.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
page_title
"Groups"
-
page_title
"Groups"
=
render
"admin/dashboard/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.top-area
.top-area
...
...
app/views/admin/health_check/show.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
page_title
_
(
'Health Check'
)
-
page_title
_
(
'Health Check'
)
-
no_errors
=
@errors
.
blank?
&&
@failing_storage_statuses
.
blank?
-
no_errors
=
@errors
.
blank?
&&
@failing_storage_statuses
.
blank?
=
render
'admin/monitoring/head'
%div
{
class:
container_class
}
%div
{
class:
container_class
}
%h3
.page-title
=
page_title
%h3
.page-title
=
page_title
...
...
app/views/admin/jobs/index.html.haml
View file @
2414d941
-
breadcrumb_title
"Jobs"
-
breadcrumb_title
"Jobs"
-
@no_container
=
true
-
@no_container
=
true
=
render
"admin/dashboard/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
...
...
app/views/admin/logs/show.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
page_title
"Logs"
-
page_title
"Logs"
=
render
'admin/monitoring/head'
%div
{
class:
container_class
}
%div
{
class:
container_class
}
%ul
.nav-links.log-tabs
%ul
.nav-links.log-tabs
...
...
app/views/admin/monitoring/_head.html.haml
deleted
100644 → 0
View file @
80471444
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
(
container_class
)
}
=
nav_link
(
controller: :system_info
)
do
=
link_to
admin_system_info_path
,
title:
'System Info'
do
%span
System Info
=
nav_link
(
controller: :background_jobs
)
do
=
link_to
admin_background_jobs_path
,
title:
'Background Jobs'
do
%span
Background Jobs
=
nav_link
(
controller: :logs
)
do
=
link_to
admin_logs_path
,
title:
'Logs'
do
%span
Logs
=
nav_link
(
controller: :health_check
)
do
=
link_to
admin_health_check_path
,
title:
'Health Check'
do
%span
Health Check
=
nav_link
(
controller: :requests_profiles
)
do
=
link_to
admin_requests_profiles_path
,
title:
'Requests Profiles'
do
%span
Requests Profiles
app/views/admin/projects/index.html.haml
View file @
2414d941
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
-
page_title
"Projects"
-
page_title
"Projects"
-
params
[
:visibility_level
]
||=
[]
-
params
[
:visibility_level
]
||=
[]
=
render
"admin/dashboard/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.top-area
.top-area
...
...
app/views/admin/requests_profiles/index.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
page_title
'Requests Profiles'
-
page_title
'Requests Profiles'
=
render
'admin/monitoring/head'
%div
{
class:
container_class
}
%div
{
class:
container_class
}
%h3
.page-title
%h3
.page-title
...
...
app/views/admin/runners/index.html.haml
View file @
2414d941
-
breadcrumb_title
"Runners"
-
breadcrumb_title
"Runners"
-
@no_container
=
true
-
@no_container
=
true
=
render
"admin/dashboard/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.bs-callout
.bs-callout
...
...
app/views/admin/system_info/show.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
page_title
"System Info"
-
page_title
"System Info"
=
render
'admin/monitoring/head'
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.prepend-top-default
.prepend-top-default
...
...
app/views/admin/users/index.html.haml
View file @
2414d941
-
@no_container
=
true
-
@no_container
=
true
-
page_title
"Users"
-
page_title
"Users"
=
render
"admin/dashboard/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.prepend-top-default
.prepend-top-default
...
...
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