From 768fff6d3338b217233e0616c26096a12e47df83 Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 12:22:01 +0200 Subject: [PATCH 1/9] chore(dependencies): upgrade ember-styleguide to latest (#879) --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2764f12a..dd0c1b6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20829,9 +20829,9 @@ } }, "node_modules/ember-styleguide": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/ember-styleguide/-/ember-styleguide-8.3.0.tgz", - "integrity": "sha512-FN0FNXDXFRoimaICswP7/5aSI8gH/sVO00ju134wbWeUR/xMHE1bA/xT1P8UGPPXM6D9IE6mrxdt9Pf2iyaYRg==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ember-styleguide/-/ember-styleguide-8.5.0.tgz", + "integrity": "sha512-R/mUM3/teRgwOffc+W8LTTl2aD4VLZ0y8fM5wpE0oQTof72R6Ddpzm4/RNduT3AUcqrnB9iCNvw91vpSrc0wlw==", "dev": true, "dependencies": { "@ember/render-modifiers": "^2.0.2", @@ -53126,9 +53126,9 @@ } }, "ember-styleguide": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/ember-styleguide/-/ember-styleguide-8.3.0.tgz", - "integrity": "sha512-FN0FNXDXFRoimaICswP7/5aSI8gH/sVO00ju134wbWeUR/xMHE1bA/xT1P8UGPPXM6D9IE6mrxdt9Pf2iyaYRg==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ember-styleguide/-/ember-styleguide-8.5.0.tgz", + "integrity": "sha512-R/mUM3/teRgwOffc+W8LTTl2aD4VLZ0y8fM5wpE0oQTof72R6Ddpzm4/RNduT3AUcqrnB9iCNvw91vpSrc0wlw==", "dev": true, "requires": { "@ember/render-modifiers": "^2.0.2", From 91546e33440d8c763876d9f240bda8c75eca1a1a Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 12:45:34 +0200 Subject: [PATCH 2/9] style: use full-width sidebar container (#879) --- app/templates/ember-cli.hbs | 2 +- app/templates/project-version.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/ember-cli.hbs b/app/templates/ember-cli.hbs index 0d2f76bd..8a5a75d0 100644 --- a/app/templates/ember-cli.hbs +++ b/app/templates/ember-cli.hbs @@ -1,4 +1,4 @@ -
+
diff --git a/app/templates/project-version.hbs b/app/templates/project-version.hbs index facc6531..396b21ba 100644 --- a/app/templates/project-version.hbs +++ b/app/templates/project-version.hbs @@ -1,4 +1,4 @@ -
+
From 79ef587529e2a41ebf9a9847179050488efcb4b5 Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 12:54:56 +0200 Subject: [PATCH 3/9] style: add padding around sidebar and content (#879) --- app/styles/app.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/styles/app.css b/app/styles/app.css index 135912e6..974f8178 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -26,6 +26,21 @@ main a.edit-icon { background: none; } +@media (min-width: 845px) { + .es-sidebar { + padding: var(--spacing-4); + background-color: var(--color-gray-200); + } +} + +.es-sidebar-content .table-of-contents:first-child { + margin-block-start: 0; +} + +.content { + margin-top: var(--spacing-4); +} + .table-of-contents { list-style-type: none; padding-left: 0; From d7702ce004ffe0ec68e41c558144aad90dba3c3d Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 13:01:20 +0200 Subject: [PATCH 4/9] style: match sidebar font-size with guidemaker-ember-template (#879) --- app/styles/app.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/styles/app.css b/app/styles/app.css index 974f8178..f43de777 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -44,13 +44,13 @@ main a.edit-icon { .table-of-contents { list-style-type: none; padding-left: 0; - font-size: var(--font-size-lg); + font-size: var(--font-size-base); font-weight: var(--font-weight-3); } .sub-table-of-contents { padding-left: var(--spacing-1); - font-size: var(--font-size-md); + font-size: var(--font-size-base); font-weight: var(--font-weight-2); } From 71784a94b62369a8069a4200d16065afa7cabd40 Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 13:41:39 +0200 Subject: [PATCH 5/9] style cleanup: move media queries down (#879) --- app/styles/app.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/styles/app.css b/app/styles/app.css index f43de777..b72c1825 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -26,13 +26,6 @@ main a.edit-icon { background: none; } -@media (min-width: 845px) { - .es-sidebar { - padding: var(--spacing-4); - background-color: var(--color-gray-200); - } -} - .es-sidebar-content .table-of-contents:first-child { margin-block-start: 0; } @@ -97,3 +90,9 @@ li.toc-heading:first-child { margin-top: 0; } +@media (min-width: 845px) { + .es-sidebar { + padding: var(--spacing-4); + background-color: var(--color-gray-200); + } +} From 837c0678444b1e6e21892bc4ee7b1fdd5084fda4 Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 13:50:12 +0200 Subject: [PATCH 6/9] style: make header full-width (#879) --- app/styles/app.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/styles/app.css b/app/styles/app.css index b72c1825..640a2888 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -26,6 +26,11 @@ main a.edit-icon { background: none; } +.es-header { + padding: 0 var(--spacing-4); + justify-content: start; +} + .es-sidebar-content .table-of-contents:first-child { margin-block-start: 0; } From bee54e8e89c0b90685757b68a4d404ef8e955b46 Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 14:10:03 +0200 Subject: [PATCH 7/9] style cleanup: only apply margin to content on desktop (#879) --- app/styles/app.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/styles/app.css b/app/styles/app.css index 640a2888..657a11f8 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -35,10 +35,6 @@ main a.edit-icon { margin-block-start: 0; } -.content { - margin-top: var(--spacing-4); -} - .table-of-contents { list-style-type: none; padding-left: 0; @@ -100,4 +96,8 @@ li.toc-heading:first-child { padding: var(--spacing-4); background-color: var(--color-gray-200); } + + .content { + margin-top: var(--spacing-4); + } } From bf6e40122719342975c4ea3ffd550cf77bd757b0 Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 14:11:10 +0200 Subject: [PATCH 8/9] style cleanup: only apply extra padding to header on desktop (#879) --- app/styles/app.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/styles/app.css b/app/styles/app.css index 657a11f8..f84ca1fc 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -26,11 +26,6 @@ main a.edit-icon { background: none; } -.es-header { - padding: 0 var(--spacing-4); - justify-content: start; -} - .es-sidebar-content .table-of-contents:first-child { margin-block-start: 0; } @@ -92,6 +87,11 @@ li.toc-heading:first-child { } @media (min-width: 845px) { + .es-header { + padding: 0 var(--spacing-4); + justify-content: start; + } + .es-sidebar { padding: var(--spacing-4); background-color: var(--color-gray-200); From 7fc78bd7dba3bd1e523ac8c886632f9c57c136f2 Mon Sep 17 00:00:00 2001 From: Lukas Nys Date: Sat, 2 Sep 2023 14:29:01 +0200 Subject: [PATCH 9/9] style: increase sidebar width to avoid items overflowing (#879) --- app/styles/app.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/styles/app.css b/app/styles/app.css index f84ca1fc..3c700eb2 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -26,6 +26,10 @@ main a.edit-icon { background: none; } +.sidebar-container { + --sidebar-width: min-content; +} + .es-sidebar-content .table-of-contents:first-child { margin-block-start: 0; } @@ -91,7 +95,7 @@ li.toc-heading:first-child { padding: 0 var(--spacing-4); justify-content: start; } - + .es-sidebar { padding: var(--spacing-4); background-color: var(--color-gray-200);