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
6effd81e
Commit
6effd81e
authored
Feb 28, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Left align logo; increase max width of title
parent
58758bd5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
24 deletions
+17
-24
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+11
-22
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+2
-2
changelogs/unreleased/27934-left-align-logo.yml
changelogs/unreleased/27934-left-align-logo.yml
+4
-0
No files found.
app/assets/stylesheets/framework/header.scss
View file @
6effd81e
...
@@ -148,16 +148,11 @@ header {
...
@@ -148,16 +148,11 @@ header {
}
}
.header-logo
{
.header-logo
{
position
:
absolute
;
display
:
inline-block
;
left
:
50%
;
margin
:
0
8px
0
3px
;
position
:
relative
;
top
:
7px
;
top
:
7px
;
transition-duration
:
.3s
;
transition-duration
:
.3s
;
z-index
:
999
;
#logo
{
position
:
relative
;
left
:
-50%
;
}
svg
,
svg
,
img
{
img
{
...
@@ -167,15 +162,6 @@ header {
...
@@ -167,15 +162,6 @@ header {
&
:hover
{
&
:hover
{
cursor
:
pointer
;
cursor
:
pointer
;
}
}
@media
(
max-width
:
$screen-xs-max
)
{
right
:
20px
;
left
:
auto
;
#logo
{
left
:
auto
;
}
}
}
}
.title
{
.title
{
...
@@ -183,7 +169,6 @@ header {
...
@@ -183,7 +169,6 @@ header {
padding-right
:
20px
;
padding-right
:
20px
;
margin
:
0
;
margin
:
0
;
font-size
:
18px
;
font-size
:
18px
;
max-width
:
385px
;
display
:
inline-block
;
display
:
inline-block
;
line-height
:
$header-height
;
line-height
:
$header-height
;
font-weight
:
normal
;
font-weight
:
normal
;
...
@@ -193,14 +178,18 @@ header {
...
@@ -193,14 +178,18 @@ header {
vertical-align
:
top
;
vertical-align
:
top
;
white-space
:
nowrap
;
white-space
:
nowrap
;
@media
(
min-width
:
$screen-sm-min
)
and
(
max-width
:
$screen-sm-max
)
{
max-width
:
300px
;
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
max-width
:
190px
;
max-width
:
190px
;
}
}
@media
(
min-width
:
$screen-sm-min
)
and
(
max-width
:
$screen-md-max
)
{
max-width
:
428px
;
}
@media
(
min-width
:
$screen-lg-min
)
{
max-width
:
685px
;
}
a
{
a
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
...
...
app/views/layouts/header/_default.html.haml
View file @
6effd81e
...
@@ -65,12 +65,12 @@
...
@@ -65,12 +65,12 @@
%div
%div
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success'
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success'
%h1
.title
=
title
.header-logo
.header-logo
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'logo'
do
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'logo'
do
=
brand_header_logo
=
brand_header_logo
%h1
.title
=
title
=
yield
:header_content
=
yield
:header_content
=
render
'shared/outdated_browser'
=
render
'shared/outdated_browser'
...
...
changelogs/unreleased/27934-left-align-logo.yml
0 → 100644
View file @
6effd81e
---
title
:
Left align logo
merge_request
:
author
:
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