summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-02-28 18:22:31 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-02-28 18:22:31 +0000
commitf7b0805c33a9c45d66d75ee961f246a3cbd9880e (patch)
tree286ef15b9ba1abc46533eef5ce71a3f81fdcce03
parentb937e03da473159e25df5126ebb107a73bfa875a (diff)
parent6effd81ea5238d1e3b32189b8ec8b63fc3ec17b7 (diff)
downloadgitlab-ce-f7b0805c33a9c45d66d75ee961f246a3cbd9880e.tar.gz
Merge branch '27934-left-align-logo' into 'master'
Left align logo; increase max width of title Closes #27934 See merge request !9588
-rw-r--r--app/assets/stylesheets/framework/header.scss33
-rw-r--r--app/views/layouts/header/_default.html.haml4
-rw-r--r--changelogs/unreleased/27934-left-align-logo.yml4
3 files changed, 17 insertions, 24 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 3945a789c82..685a4847731 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -148,16 +148,11 @@ header {
}
.header-logo {
- position: absolute;
- left: 50%;
+ display: inline-block;
+ margin: 0 8px 0 3px;
+ position: relative;
top: 7px;
transition-duration: .3s;
- z-index: 999;
-
- #logo {
- position: relative;
- left: -50%;
- }
svg,
img {
@@ -167,15 +162,6 @@ header {
&:hover {
cursor: pointer;
}
-
- @media (max-width: $screen-xs-max) {
- right: 20px;
- left: auto;
-
- #logo {
- left: auto;
- }
- }
}
.title {
@@ -183,7 +169,6 @@ header {
padding-right: 20px;
margin: 0;
font-size: 18px;
- max-width: 385px;
display: inline-block;
line-height: $header-height;
font-weight: normal;
@@ -193,14 +178,18 @@ header {
vertical-align: top;
white-space: nowrap;
- @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- max-width: 300px;
- }
-
@media (max-width: $screen-xs-max) {
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 {
color: $gl-text-color;
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 66f5204a5c8..c28661c2351 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -65,12 +65,12 @@
%div
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success'
- %h1.title= title
-
.header-logo
= link_to root_path, class: 'home', title: 'Dashboard', id: 'logo' do
= brand_header_logo
+ %h1.title= title
+
= yield :header_content
= render 'shared/outdated_browser'
diff --git a/changelogs/unreleased/27934-left-align-logo.yml b/changelogs/unreleased/27934-left-align-logo.yml
new file mode 100644
index 00000000000..d4e5e169465
--- /dev/null
+++ b/changelogs/unreleased/27934-left-align-logo.yml
@@ -0,0 +1,4 @@
+---
+title: Left align logo
+merge_request:
+author: