diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-23 22:42:55 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-24 11:30:37 -0400 |
| commit | 12af7464cf94dcb4d1983f1b32934e67567e2940 (patch) | |
| tree | 0a40cb37ec0068397e4b23ddde00d1de951e91d4 | |
| parent | 79193669446ec203fb746b08ccfac94775df4a70 (diff) | |
| download | gitlab-ce-12af7464cf94dcb4d1983f1b32934e67567e2940.tar.gz | |
Merge branch 'fix-logo' into 'master'
Remove width restriction for logo on sign-in page.
Follow-up on !4661 since we didn't remove the width restriction on that.
See merge request !4888
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 24873b551ab..14cc4b4329a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,6 +31,7 @@ v 8.9.1 (unreleased) - Restore old behavior around diff notes to outdated discussions. !4870 - Fix merge requests project settings help link anchor. !4873 - Fix 404 when accessing pipelines as guest user on public projects. !4881 + - Remove width restriction for logo on sign-in page. !4888 - Bump gitlab_git to 10.2.3 to fix false truncated warnings with ISO-8559 files. !4884 - Apply selected value as label. !4886 diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index e8cbe7f3c02..c32ce5195c6 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -26,7 +26,6 @@ header { text-align: center; #tanuki-logo, img { - width: 36px; height: 36px; } } |