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
Tatuya Kamada
gitlab-ce
Commits
4a8bd9fa
Commit
4a8bd9fa
authored
Apr 01, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some tweaks to new sidebar
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
22479fd0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
18 deletions
+19
-18
app/assets/stylesheets/framework/gitlab-theme.scss
app/assets/stylesheets/framework/gitlab-theme.scss
+5
-1
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+12
-7
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+1
-1
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+1
-1
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+0
-8
No files found.
app/assets/stylesheets/framework/gitlab-theme.scss
View file @
4a8bd9fa
...
@@ -33,11 +33,15 @@
...
@@ -33,11 +33,15 @@
background
:
$color
;
background
:
$color
;
}
}
.complex-sidebar
.nav-primary
{
border-right
:
1px
solid
lighten
(
$color
,
3%
);
}
.sidebar-wrapper
{
.sidebar-wrapper
{
background
:
$color-darker
;
background
:
$color-darker
;
.sidebar-user
{
.sidebar-user
{
border-top
:
1px
solid
$color
;
border-top
:
1px
solid
lighten
(
$color
,
3%
)
;
background
:
$color-darker
;
background
:
$color-darker
;
color
:
$color-light
;
color
:
$color-light
;
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
4a8bd9fa
...
@@ -296,7 +296,6 @@
...
@@ -296,7 +296,6 @@
.nav-primary
{
.nav-primary
{
width
:
61px
;
width
:
61px
;
float
:
left
;
float
:
left
;
border-right
:
1px
solid
rgba
(
255
,
255
,
255
,
0
.1
);
height
:
100vh
;
height
:
100vh
;
.nav-sidebar
{
.nav-sidebar
{
...
@@ -313,17 +312,23 @@
...
@@ -313,17 +312,23 @@
}
}
.nav-secondary
{
.nav-secondary
{
$nav-secondary-width
:
168px
;
float
:
left
;
float
:
left
;
width
:
168px
;
width
:
$nav-secondary-width
;
.nav-sidebar
{
.nav-sidebar
{
width
:
168px
;
width
:
$nav-secondary-width
;
li
a
{
li
{
width
:
168px
;
width
:
$nav-secondary-width
;
i
{
a
{
display
:
none
;
width
:
$nav-secondary-width
;
i
{
display
:
none
;
}
}
}
}
}
}
}
...
...
app/views/layouts/nav/_admin.html.haml
View file @
4a8bd9fa
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
Spam Logs
Spam Logs
%span
.count
=
number_with_delimiter
(
SpamLog
.
count
(
:all
))
%span
.count
=
number_with_delimiter
(
SpamLog
.
count
(
:all
))
=
nav_link
(
controller: :application_settings
,
html_options:
{
class:
'separate-item'
}
)
do
=
nav_link
(
controller: :application_settings
)
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
=
icon
(
'cogs fw'
)
=
icon
(
'cogs fw'
)
%span
%span
...
...
app/views/layouts/nav/_group.html.haml
View file @
4a8bd9fa
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
%span
%span
Members
Members
-
if
can?
(
current_user
,
:admin_group
,
@group
)
-
if
can?
(
current_user
,
:admin_group
,
@group
)
=
nav_link
(
html_options:
{
class:
""
})
do
=
nav_link
do
=
link_to
edit_group_path
(
@group
),
title:
'Settings'
do
=
link_to
edit_group_path
(
@group
),
title:
'Settings'
do
=
icon
(
'cogs fw'
)
=
icon
(
'cogs fw'
)
%span
%span
...
...
app/views/layouts/nav/_profile.html.haml
View file @
4a8bd9fa
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
=
nav_link
do
=
link_to
root_path
,
title:
'Go to dashboard'
,
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
%span
Go to dashboard
%li
.separate-item
=
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
=
icon
(
'user fw'
)
=
icon
(
'user fw'
)
...
...
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