From 66d5b9f74c21f4281ef31dcfed14d5b76e0d13d3 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 12 Jan 2018 23:10:25 +0000 Subject: [PATCH 1/6] Change the text-only home logo to an H1 Fixes https://meta.discourse.org/t/77892 --- app/assets/javascripts/discourse/widgets/home-logo.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 index c226d944eb..0c4c7bcf25 100644 --- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 +++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 @@ -38,7 +38,7 @@ export default createWidget('home-logo', { } else if (logoUrl.length) { return h('img#site-logo.logo-big', { key: 'logo-big', attributes: { src: logoUrl, alt: title } }); } else { - return h('h2#site-text-logo.text-logo', { key: 'logo-text' }, title); + return h('h1#site-text-logo.text-logo', { key: 'logo-text' }, title); } }, From f29d233287752df7a524e36dd010079e020c1197 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 12 Jan 2018 23:20:36 +0000 Subject: [PATCH 2/6] Fix test case for site logo as `

` --- test/javascripts/widgets/home-logo-test.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6 index 96bd889f50..70615b7805 100644 --- a/test/javascripts/widgets/home-logo-test.js.es6 +++ b/test/javascripts/widgets/home-logo-test.js.es6 @@ -51,7 +51,7 @@ widgetTest('no logo', { }, test(assert) { - assert.ok(this.$('h2#site-text-logo.text-logo').length === 1); + assert.ok(this.$('h1#site-text-logo.text-logo').length === 1); assert.equal(this.$('#site-text-logo').text(), title); } }); From 4c31e4c44edbaf5c04873917cba7f0b6bd6e4b89 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 12 Jan 2018 23:21:53 +0000 Subject: [PATCH 3/6] Change mobile site text logo to target `

` --- app/assets/stylesheets/mobile/discourse.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss index 47ac9efc47..d69ffc1dd2 100644 --- a/app/assets/stylesheets/mobile/discourse.scss +++ b/app/assets/stylesheets/mobile/discourse.scss @@ -154,6 +154,6 @@ blockquote { // somehow the image logo assumption inherits margins from earlier in the CSS // stack we must remove margins for text site titles -h2#site-text-logo { +h1#site-text-logo { margin: 0 0 0 10px; } From 333ab59f97c7dae3e6b9090c2041753465ba8e71 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 12 Jan 2018 23:30:14 +0000 Subject: [PATCH 4/6] Fix the site header to size 1.5em --- app/assets/stylesheets/desktop/header.scss | 1 + app/assets/stylesheets/mobile/header.scss | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss index d90ed876d9..a3c55acdb9 100644 --- a/app/assets/stylesheets/desktop/header.scss +++ b/app/assets/stylesheets/desktop/header.scss @@ -43,6 +43,7 @@ and (max-width : 570px) { header { #site-text-logo { + font-size: 1.5em; margin-top: .4em; line-height: $line-height-medium; } diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss index df2e5090eb..67dda8fc3b 100644 --- a/app/assets/stylesheets/mobile/header.scss +++ b/app/assets/stylesheets/mobile/header.scss @@ -2,6 +2,9 @@ // Discourse header // -------------------------------------------------- +#site-text-logo { + font-size: 1.5em; +} @media only screen and (max-width: 320px) { #site-text-logo { font-size: $font-up-2; From 3fbf731e2da71cb9664cb5d2c794b809d0146574 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Wed, 17 Jan 2018 14:26:14 -0700 Subject: [PATCH 5/6] Fix font-up-3 nit --- app/assets/stylesheets/mobile/header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss index 67dda8fc3b..30f480f94b 100644 --- a/app/assets/stylesheets/mobile/header.scss +++ b/app/assets/stylesheets/mobile/header.scss @@ -3,7 +3,7 @@ // -------------------------------------------------- #site-text-logo { - font-size: 1.5em; + font-size: $font-up-3; } @media only screen and (max-width: 320px) { #site-text-logo { From dff5951fa638be0fab7b1539848feb177305553e Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Wed, 17 Jan 2018 14:26:35 -0700 Subject: [PATCH 6/6] Fix font-up-3 nit --- app/assets/stylesheets/desktop/header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss index a3c55acdb9..ed8c062873 100644 --- a/app/assets/stylesheets/desktop/header.scss +++ b/app/assets/stylesheets/desktop/header.scss @@ -43,7 +43,7 @@ and (max-width : 570px) { header { #site-text-logo { - font-size: 1.5em; + font-size: $font-up-3; margin-top: .4em; line-height: $line-height-medium; }