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
Léo-Paul Géneau
gitlab-ce
Commits
7b804e23
Commit
7b804e23
authored
9 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Have sidebar labels disappear behind content instead of hide immediately.
parent
9c022973
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
44 deletions
+37
-44
app/assets/stylesheets/generic/header.scss
app/assets/stylesheets/generic/header.scss
+1
-4
app/assets/stylesheets/generic/sidebar.scss
app/assets/stylesheets/generic/sidebar.scss
+36
-40
No files found.
app/assets/stylesheets/generic/header.scss
View file @
7b804e23
...
...
@@ -69,6 +69,7 @@ header {
float
:
left
;
height
:
$header-height
;
width
:
$sidebar_width
;
overflow
:
hidden
;
transition-duration
:
.3s
;
a
{
...
...
@@ -169,10 +170,6 @@ header {
@mixin
collapsed-header
{
.header-logo
{
width
:
$sidebar_collapsed_width
;
h3
{
display
:
none
;
}
}
.header-content
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/generic/sidebar.scss
View file @
7b804e23
...
...
@@ -29,16 +29,10 @@
&
.navbar-collapse
{
padding
:
0px
!
important
;
}
}
.nav-sidebar
li
a
.count
{
float
:
right
;
background
:
#eee
;
padding
:
0px
8px
;
@include
border-radius
(
6px
);
}
li
{
width
:
$sidebar_width
;
.nav-sidebar
li
{
&
.separate-item
{
padding-top
:
10px
;
margin-top
:
10px
;
...
...
@@ -66,6 +60,14 @@
color
:
$gray-light
;
margin-right
:
23px
;
}
.count
{
float
:
right
;
background
:
#eee
;
padding
:
0px
8px
;
@include
border-radius
(
6px
);
}
}
}
}
...
...
@@ -116,11 +118,6 @@
padding
:
8px
15px
;
text-align
:
left
;
padding-left
:
16px
;
&
>
span
{
display
:
none
;
}
}
}
...
...
@@ -130,9 +127,7 @@
}
.sidebar-user
{
.username
{
display
:
none
;
}
width
:
$sidebar_collapsed_width
;
}
}
}
...
...
@@ -182,12 +177,13 @@
.sidebar-user
{
position
:
absolute
;
bottom
:
0
;
width
:
100%
;
width
:
$sidebar_width
;
padding
:
10px
;
overflow
:
hidden
;
transition-duration
:
.3s
;
.username
{
margin-top
:
5px
;
width
:
23
0px
;
width
:
$sidebar_width
-
2
*
1
0px
;
}
}
This diff is collapsed.
Click to expand it.
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