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
ac6dfbd9
Commit
ac6dfbd9
authored
Sep 04, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make header and sidebar avatar more compact
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
670544c8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
app/assets/stylesheets/base/variables.scss
app/assets/stylesheets/base/variables.scss
+1
-1
app/assets/stylesheets/generic/sidebar.scss
app/assets/stylesheets/generic/sidebar.scss
+10
-6
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
No files found.
app/assets/stylesheets/base/variables.scss
View file @
ac6dfbd9
...
@@ -12,7 +12,7 @@ $code_font_size: 13px;
...
@@ -12,7 +12,7 @@ $code_font_size: 13px;
$code_line_height
:
1
.5
;
$code_line_height
:
1
.5
;
$border-color
:
#E7E9ED
;
$border-color
:
#E7E9ED
;
$background-color
:
#F8FAFC
;
$background-color
:
#F8FAFC
;
$header-height
:
6
7
px
;
$header-height
:
6
1
px
;
$fixed-layout-width
:
1200px
;
$fixed-layout-width
:
1200px
;
$gl-gray
:
#7f8fa4
;
$gl-gray
:
#7f8fa4
;
$gl-padding
:
16px
;
$gl-padding
:
16px
;
...
...
app/assets/stylesheets/generic/sidebar.scss
View file @
ac6dfbd9
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
width
:
$sidebar_collapsed_width
;
width
:
$sidebar_collapsed_width
;
a
{
a
{
padding-left
:
7
px
;
padding-left
:
10
px
;
.gitlab-text-container
{
.gitlab-text-container
{
display
:
none
;
display
:
none
;
...
@@ -151,8 +151,12 @@
...
@@ -151,8 +151,12 @@
}
}
.sidebar-user
{
.sidebar-user
{
padding-left
:
7
px
;
padding-left
:
10
px
;
width
:
$sidebar_collapsed_width
;
width
:
$sidebar_collapsed_width
;
.username
{
display
:
none
;
}
}
}
}
}
}
}
...
@@ -210,7 +214,7 @@
...
@@ -210,7 +214,7 @@
margin-left
:
10px
;
margin-left
:
10px
;
width
:
$sidebar_width
-
2
*
10px
;
width
:
$sidebar_width
-
2
*
10px
;
font-size
:
16px
;
font-size
:
16px
;
line-height
:
44
px
;
line-height
:
36
px
;
}
}
}
}
...
@@ -231,8 +235,8 @@
...
@@ -231,8 +235,8 @@
overflow
:
hidden
;
overflow
:
hidden
;
img
{
img
{
width
:
$gl-avatar-size
;
width
:
40px
;
height
:
$gl-avatar-size
;
height
:
40px
;
float
:
left
;
float
:
left
;
}
}
...
@@ -245,7 +249,7 @@
...
@@ -245,7 +249,7 @@
margin
:
0
;
margin
:
0
;
margin-left
:
14px
;
margin-left
:
14px
;
font-size
:
19px
;
font-size
:
19px
;
line-height
:
4
9
px
;
line-height
:
4
1
px
;
font-weight
:
normal
;
font-weight
:
normal
;
}
}
}
}
...
...
app/views/layouts/_page.html.haml
View file @
ac6dfbd9
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
=
render
partial:
'layouts/collapse_button'
=
render
partial:
'layouts/collapse_button'
-
if
current_user
-
if
current_user
=
link_to
current_user
,
class:
'sidebar-user'
do
=
link_to
current_user
,
class:
'sidebar-user'
do
=
image_tag
avatar_icon
(
current_user
.
email
,
60
),
alt:
'User activity'
,
class:
'avatar avatar s4
6
'
=
image_tag
avatar_icon
(
current_user
.
email
,
60
),
alt:
'User activity'
,
class:
'avatar avatar s4
0
'
.username
.username
=
current_user
.
username
=
current_user
.
username
.content-wrapper
.content-wrapper
...
...
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