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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
e82130bd
Commit
e82130bd
authored
Aug 23, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide group title on sidebar collapse; use more generic class for titles
parent
c184a135
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
7 deletions
+6
-7
app/assets/stylesheets/new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+2
-3
app/views/layouts/nav/_new_admin_sidebar.html.haml
app/views/layouts/nav/_new_admin_sidebar.html.haml
+1
-1
app/views/layouts/nav/_new_group_sidebar.html.haml
app/views/layouts/nav/_new_group_sidebar.html.haml
+1
-1
app/views/layouts/nav/_new_profile_sidebar.html.haml
app/views/layouts/nav/_new_profile_sidebar.html.haml
+1
-1
app/views/layouts/nav/_new_project_sidebar.html.haml
app/views/layouts/nav/_new_project_sidebar.html.haml
+1
-1
No files found.
app/assets/stylesheets/new_sidebar.scss
View file @
e82130bd
...
@@ -70,8 +70,7 @@ $new-sidebar-collapsed-width: 50px;
...
@@ -70,8 +70,7 @@ $new-sidebar-collapsed-width: 50px;
background-color
:
$white-light
;
background-color
:
$white-light
;
}
}
.project-title
,
.sidebar-context-title
{
.group-title
{
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
}
}
...
@@ -109,7 +108,7 @@ $new-sidebar-collapsed-width: 50px;
...
@@ -109,7 +108,7 @@ $new-sidebar-collapsed-width: 50px;
}
}
.badge
,
.badge
,
.
projec
t-title
{
.
sidebar-contex
t-title
{
display
:
none
;
display
:
none
;
}
}
...
...
app/views/layouts/nav/_new_admin_sidebar.html.haml
View file @
e82130bd
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
link_to
admin_root_path
,
title:
'Admin Overview'
do
=
link_to
admin_root_path
,
title:
'Admin Overview'
do
.avatar-container.s40.settings-avatar
.avatar-container.s40.settings-avatar
=
icon
(
'wrench'
)
=
icon
(
'wrench'
)
.
projec
t-title
Admin Area
.
sidebar-contex
t-title
Admin Area
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
controller:
%w(dashboard admin projects users groups jobs runners cohorts)
,
html_options:
{
class:
'home'
})
do
=
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
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
...
...
app/views/layouts/nav/_new_group_sidebar.html.haml
View file @
e82130bd
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
link_to
group_path
(
@group
),
title:
@group
.
name
do
=
link_to
group_path
(
@group
),
title:
@group
.
name
do
.avatar-container.s40.group-avatar
.avatar-container.s40.group-avatar
=
image_tag
group_icon
(
@group
),
class:
"avatar s40 avatar-tile"
=
image_tag
group_icon
(
@group
),
class:
"avatar s40 avatar-tile"
.
group
-title
.
sidebar-context
-title
=
@group
.
name
=
@group
.
name
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'groups#subgroups'
],
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'groups#subgroups'
],
html_options:
{
class:
'home'
})
do
...
...
app/views/layouts/nav/_new_profile_sidebar.html.haml
View file @
e82130bd
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
link_to
profile_path
,
title:
'Profile Settings'
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
.avatar-container.s40.settings-avatar
.avatar-container.s40.settings-avatar
=
icon
(
'user'
)
=
icon
(
'user'
)
.
projec
t-title
User Settings
.
sidebar-contex
t-title
User Settings
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
...
...
app/views/layouts/nav/_new_project_sidebar.html.haml
View file @
e82130bd
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
=
link_to
project_path
(
@project
),
title:
@project
.
name
do
=
link_to
project_path
(
@project
),
title:
@project
.
name
do
.avatar-container.s40.project-avatar
.avatar-container.s40.project-avatar
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'avatar s40 avatar-tile'
)
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'avatar s40 avatar-tile'
)
.
projec
t-title
.
sidebar-contex
t-title
=
@project
.
name
=
@project
.
name
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
path:
[
'projects#show'
,
'projects#activity'
,
'cycle_analytics#show'
],
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'projects#show'
,
'projects#activity'
,
'cycle_analytics#show'
],
html_options:
{
class:
'home'
})
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