diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-03 00:24:35 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-03 00:24:35 +0000 |
| commit | edba43527612c6eb511299b2590b818e8d74f9c3 (patch) | |
| tree | ec3fd290fd3c9f8c0e2c7c7c1398070f1dfcd008 | |
| parent | 46a0b256172b661cff6afeb11fa51c5f34ba7e7d (diff) | |
| parent | 35d035ea6812780144233b00621727fa9b8de7d7 (diff) | |
| download | gitlab-ce-edba43527612c6eb511299b2590b818e8d74f9c3.tar.gz | |
Merge branch '28935-make-logo-smaller' into 'master'
Decrease tanuki logo size
Closes #28935
See merge request !9676
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 6 | ||||
| -rw-r--r-- | app/views/shared/_logo.svg | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/28935-make-logo-smaller.yml | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 685a4847731..f4316ec7022 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -149,14 +149,14 @@ header { .header-logo { display: inline-block; - margin: 0 8px 0 3px; + margin: 0 7px 0 2px; position: relative; - top: 7px; + top: 10px; transition-duration: .3s; svg, img { - height: 36px; + height: 28px; } &:hover { diff --git a/app/views/shared/_logo.svg b/app/views/shared/_logo.svg index 9b67422da2c..10e6c49ae9f 100644 --- a/app/views/shared/_logo.svg +++ b/app/views/shared/_logo.svg @@ -1,4 +1,4 @@ -<svg width="36" height="36" class="tanuki-logo"> +<svg width="28" height="28" class="tanuki-logo" viewBox="0 0 36 36"> <path class="tanuki-shape tanuki-left-ear" fill="#e24329" d="M2 14l9.38 9v-9l-4-12.28c-.205-.632-1.176-.632-1.38 0z"/> <path class="tanuki-shape tanuki-right-ear" fill="#e24329" d="M34 14l-9.38 9v-9l4-12.28c.205-.632 1.176-.632 1.38 0z"/> <path class="tanuki-shape tanuki-nose" fill="#e24329" d="M18,34.38 3,14 33,14 Z"/> diff --git a/changelogs/unreleased/28935-make-logo-smaller.yml b/changelogs/unreleased/28935-make-logo-smaller.yml new file mode 100644 index 00000000000..ef79fc7d212 --- /dev/null +++ b/changelogs/unreleased/28935-make-logo-smaller.yml @@ -0,0 +1,4 @@ +--- +title: Decrease tanuki logo size +merge_request: +author: |
