From adf8f719829b41b371c27fb26ca7e4e7ac1aace9 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Thu, 2 Mar 2023 10:48:31 +0530 Subject: [PATCH 01/19] Update dropdown-header.js.es6 --- javascripts/discourse/api-initializers/dropdown-header.js.es6 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/javascripts/discourse/api-initializers/dropdown-header.js.es6 b/javascripts/discourse/api-initializers/dropdown-header.js.es6 index 6dbb4c8..dc06241 100644 --- a/javascripts/discourse/api-initializers/dropdown-header.js.es6 +++ b/javascripts/discourse/api-initializers/dropdown-header.js.es6 @@ -10,7 +10,8 @@ export default apiInitializer("0.11.1", (api) => { const links_position = settings.links_position === "right" ? "header-buttons:before" - : "home-logo:after"; + : "home-logo:after" + : "header-contents:after"; api.decorateWidget(links_position, (helper) => { const scrolling = helper.attrs.minimized; From 7e296302e170d9f24be2eb97f256f9026a5108dc Mon Sep 17 00:00:00 2001 From: Bhanu Date: Thu, 2 Mar 2023 10:48:59 +0530 Subject: [PATCH 02/19] Update dropdown-header.js.es6 --- javascripts/discourse/api-initializers/dropdown-header.js.es6 | 1 - 1 file changed, 1 deletion(-) diff --git a/javascripts/discourse/api-initializers/dropdown-header.js.es6 b/javascripts/discourse/api-initializers/dropdown-header.js.es6 index dc06241..f0f0a83 100644 --- a/javascripts/discourse/api-initializers/dropdown-header.js.es6 +++ b/javascripts/discourse/api-initializers/dropdown-header.js.es6 @@ -10,7 +10,6 @@ export default apiInitializer("0.11.1", (api) => { const links_position = settings.links_position === "right" ? "header-buttons:before" - : "home-logo:after" : "header-contents:after"; api.decorateWidget(links_position, (helper) => { From b9c06922ff43ebdf6fb3f8aca71b67eac59569f0 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sun, 5 Mar 2023 19:42:00 +0530 Subject: [PATCH 03/19] Disable animation --- common/common.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/common.scss b/common/common.scss index b7d305b..96e5cac 100644 --- a/common/common.scss +++ b/common/common.scss @@ -54,8 +54,8 @@ max-width: 280px; list-style: none; transform: scale(0); - transition: transform 0.2s ease; - transition-delay: 0.3s; + /*transition: transform 0.2s ease;*/ + /*transition-delay: 0.3s;*/ &-link { color: $dropdown_item_color; From 629c5689c57d6c5463e7384586396f28971e849b Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sun, 5 Mar 2023 22:44:34 +0530 Subject: [PATCH 04/19] Hack to make 3rd item white --- common/common.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/common.scss b/common/common.scss index 96e5cac..1dc4094 100644 --- a/common/common.scss +++ b/common/common.scss @@ -28,6 +28,10 @@ transition: transform 0.25s ease; } } + .custom-header-links .top-level-links .custom-header-linknth-of-type(3) { + color: #ffffff; + + } &:hover { color: $main_link_hover_color; From 956a977a3f136c41f2c6904d1fa635878ce70839 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sun, 5 Mar 2023 22:46:31 +0530 Subject: [PATCH 05/19] Reverted --- common/common.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/common/common.scss b/common/common.scss index 1dc4094..96e5cac 100644 --- a/common/common.scss +++ b/common/common.scss @@ -28,10 +28,6 @@ transition: transform 0.25s ease; } } - .custom-header-links .top-level-links .custom-header-linknth-of-type(3) { - color: #ffffff; - - } &:hover { color: $main_link_hover_color; From 330a80ccf7bc0055d8c64988207d30e7504e4cd2 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 8 Mar 2023 17:55:40 +0530 Subject: [PATCH 06/19] Update mobile.scss --- mobile/mobile.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/mobile.scss b/mobile/mobile.scss index 86e6634..8afb444 100644 --- a/mobile/mobile.scss +++ b/mobile/mobile.scss @@ -2,7 +2,7 @@ .mobile-view { .top-level-links { - @include dropdown; + /*@include dropdown;*/ position: fixed; left: 0; margin: 0; From c98109e8553b9989f39eb0cfe726752491fa789d Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 8 Mar 2023 17:58:31 +0530 Subject: [PATCH 07/19] Update mobile.scss --- mobile/mobile.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mobile/mobile.scss b/mobile/mobile.scss index 8afb444..56ee95c 100644 --- a/mobile/mobile.scss +++ b/mobile/mobile.scss @@ -1,8 +1,8 @@ @import "mixins"; -.mobile-view { +/*.mobile-view { .top-level-links { - /*@include dropdown;*/ + @include dropdown; position: fixed; left: 0; margin: 0; @@ -42,3 +42,4 @@ position: fixed; } } +*/ From c5bfb2c96c7126ae732845d43c5d48a424058a80 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 8 Mar 2023 18:05:53 +0530 Subject: [PATCH 08/19] Update custom-header-links.js.es6 --- .../widgets/custom-header-links.js.es6 | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index d90a3fb..dc84017 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -24,15 +24,15 @@ createWidget('custom-header-links', { }; }, - defaultState() { - let showLinks = !this.site.mobileView; - const mobileView = this.site.mobileView; +// defaultState() { +// let showLinks = !this.site.mobileView; +// const mobileView = this.site.mobileView; - return { - mobileView, - showLinks, - }; - }, +// return { +// mobileView, +// showLinks, +// }; +// }, toggleHeaderLinks() { this.state.showLinks = !this.state.showLinks; @@ -54,17 +54,17 @@ createWidget('custom-header-links', { }, template: hbs` - {{#if this.state.mobileView}} - - {{attach - widget="button" - attrs=(hash - action="toggleHeaderLinks" - icon="caret-square-down" - ) - }} - - {{/if}} +// {{#if this.state.mobileView}} +// +// {{attach +// widget="button" +// attrs=(hash +// action="toggleHeaderLinks" +// icon="caret-square-down" +// ) +// }} +// +// {{/if}} {{#if this.state.showLinks}}
    {{#each transformed.headerLinks as |item|}} From d1160ed9a54066b29266aaa812712c8914668e7d Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 8 Mar 2023 18:12:30 +0530 Subject: [PATCH 09/19] Update custom-header-links.js.es6 --- .../widgets/custom-header-links.js.es6 | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index dc84017..d90a3fb 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -24,15 +24,15 @@ createWidget('custom-header-links', { }; }, -// defaultState() { -// let showLinks = !this.site.mobileView; -// const mobileView = this.site.mobileView; + defaultState() { + let showLinks = !this.site.mobileView; + const mobileView = this.site.mobileView; -// return { -// mobileView, -// showLinks, -// }; -// }, + return { + mobileView, + showLinks, + }; + }, toggleHeaderLinks() { this.state.showLinks = !this.state.showLinks; @@ -54,17 +54,17 @@ createWidget('custom-header-links', { }, template: hbs` -// {{#if this.state.mobileView}} -// -// {{attach -// widget="button" -// attrs=(hash -// action="toggleHeaderLinks" -// icon="caret-square-down" -// ) -// }} -// -// {{/if}} + {{#if this.state.mobileView}} + + {{attach + widget="button" + attrs=(hash + action="toggleHeaderLinks" + icon="caret-square-down" + ) + }} + + {{/if}} {{#if this.state.showLinks}}
      {{#each transformed.headerLinks as |item|}} From ced41630be4d67a3af1a609eb81ff5dc240a7225 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 8 Mar 2023 19:45:16 +0530 Subject: [PATCH 10/19] Update custom-header-links.js.es6 --- javascripts/discourse/widgets/custom-header-links.js.es6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index d90a3fb..14df329 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -25,8 +25,10 @@ createWidget('custom-header-links', { }, defaultState() { - let showLinks = !this.site.mobileView; - const mobileView = this.site.mobileView; + //let showLinks = !this.site.mobileView; + let showLinks = true; + //const mobileView = this.site.mobileView; + const mobileView = false; return { mobileView, From a21451c4b1848e6d1ec4dbdb5a3c517a671b9092 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 8 Mar 2023 19:52:26 +0530 Subject: [PATCH 11/19] Update custom-header-links.js.es6 --- javascripts/discourse/widgets/custom-header-links.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index 14df329..0f9f532 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -46,7 +46,7 @@ createWidget('custom-header-links', { }, clickOutside() { - if (this.site.desktopView) { + //if (this.site.desktopView) { return; } From a4504b9dc0de9e7ce405b8612bda489dcfe64af3 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 8 Mar 2023 19:56:13 +0530 Subject: [PATCH 12/19] Update custom-header-links.js.es6 --- javascripts/discourse/widgets/custom-header-links.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index 0f9f532..14df329 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -46,7 +46,7 @@ createWidget('custom-header-links', { }, clickOutside() { - //if (this.site.desktopView) { + if (this.site.desktopView) { return; } From 406bdefdb4bcf0343f31df5ab722f7f717343dae Mon Sep 17 00:00:00 2001 From: Bhanu Date: Thu, 9 Mar 2023 01:38:16 +0530 Subject: [PATCH 13/19] Update custom-header-links.js.es6 --- javascripts/discourse/widgets/custom-header-links.js.es6 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index 14df329..e5161a8 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -51,7 +51,8 @@ createWidget('custom-header-links', { } if (this.state.showLinks) { - this.sendWidgetAction("toggleHeaderLinks"); + //this.sendWidgetAction("toggleHeaderLinks"); + return; } }, From e0b06c4269633ad5ca6a0c5515f4285ba6e22af0 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Thu, 9 Mar 2023 01:44:38 +0530 Subject: [PATCH 14/19] Update custom-header-links.js.es6 --- .../discourse/widgets/custom-header-links.js.es6 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index e5161a8..d0fbf19 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -45,16 +45,16 @@ createWidget('custom-header-links', { } }, - clickOutside() { - if (this.site.desktopView) { - return; - } +// clickOutside() { +// if (this.site.desktopView) { +// return; +// } - if (this.state.showLinks) { +// if (this.state.showLinks) { //this.sendWidgetAction("toggleHeaderLinks"); - return; - } - }, +// return; +// } +// }, template: hbs` {{#if this.state.mobileView}} From 31c0304f11c57acc0bc75aef0409039e9ee46644 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 5 Apr 2023 23:35:59 +0530 Subject: [PATCH 15/19] Update custom-header-links.js.es6 --- .../widgets/custom-header-links.js.es6 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index d0fbf19..07dceac 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -45,16 +45,16 @@ createWidget('custom-header-links', { } }, -// clickOutside() { -// if (this.site.desktopView) { -// return; -// } + clickOutside() { + if (this.site.desktopView) { + return; + } -// if (this.state.showLinks) { - //this.sendWidgetAction("toggleHeaderLinks"); -// return; -// } -// }, + if (this.state.showLinks) { + this.sendWidgetAction("toggleHeaderLinks"); + return; + } + }, template: hbs` {{#if this.state.mobileView}} From 01c90913e180598422682f5435fdb285319d8234 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 5 Apr 2023 23:38:33 +0530 Subject: [PATCH 16/19] Update custom-header-links.js.es6 --- .../widgets/custom-header-links.js.es6 | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/javascripts/discourse/widgets/custom-header-links.js.es6 b/javascripts/discourse/widgets/custom-header-links.js.es6 index 07dceac..394620a 100644 --- a/javascripts/discourse/widgets/custom-header-links.js.es6 +++ b/javascripts/discourse/widgets/custom-header-links.js.es6 @@ -36,25 +36,25 @@ createWidget('custom-header-links', { }; }, - toggleHeaderLinks() { - this.state.showLinks = !this.state.showLinks; - if (this.state.showLinks) { - document.body.classList.add("dropdown-header-open"); - } else { - document.body.classList.remove("dropdown-header-open"); - } - }, +// toggleHeaderLinks() { +// this.state.showLinks = !this.state.showLinks; +// if (this.state.showLinks) { +// document.body.classList.add("dropdown-header-open"); +// } else { +// document.body.classList.remove("dropdown-header-open"); +// } +// }, - clickOutside() { - if (this.site.desktopView) { - return; - } +// clickOutside() { +// if (this.site.desktopView) { +// return; +// } - if (this.state.showLinks) { - this.sendWidgetAction("toggleHeaderLinks"); - return; - } - }, +// if (this.state.showLinks) { +// this.sendWidgetAction("toggleHeaderLinks"); +// return; +// } +// }, template: hbs` {{#if this.state.mobileView}} From ef014a010e5768281bdbea80e927a4e9f641ad4d Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 10 May 2023 13:18:05 +0530 Subject: [PATCH 17/19] Update dropdown-header.js.es6 --- javascripts/discourse/api-initializers/dropdown-header.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascripts/discourse/api-initializers/dropdown-header.js.es6 b/javascripts/discourse/api-initializers/dropdown-header.js.es6 index f0f0a83..a8daaf3 100644 --- a/javascripts/discourse/api-initializers/dropdown-header.js.es6 +++ b/javascripts/discourse/api-initializers/dropdown-header.js.es6 @@ -10,7 +10,7 @@ export default apiInitializer("0.11.1", (api) => { const links_position = settings.links_position === "right" ? "header-buttons:before" - : "header-contents:after"; + : "below-site-header"; api.decorateWidget(links_position, (helper) => { const scrolling = helper.attrs.minimized; From 3745947c86dc03bc466d1df995d85538dd33b938 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Wed, 10 May 2023 13:20:28 +0530 Subject: [PATCH 18/19] Update dropdown-header.js.es6 --- javascripts/discourse/api-initializers/dropdown-header.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascripts/discourse/api-initializers/dropdown-header.js.es6 b/javascripts/discourse/api-initializers/dropdown-header.js.es6 index a8daaf3..f0f0a83 100644 --- a/javascripts/discourse/api-initializers/dropdown-header.js.es6 +++ b/javascripts/discourse/api-initializers/dropdown-header.js.es6 @@ -10,7 +10,7 @@ export default apiInitializer("0.11.1", (api) => { const links_position = settings.links_position === "right" ? "header-buttons:before" - : "below-site-header"; + : "header-contents:after"; api.decorateWidget(links_position, (helper) => { const scrolling = helper.attrs.minimized; From dbe05ae482572775601945f9a70c86918d803df0 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Tue, 28 May 2024 20:59:40 +0200 Subject: [PATCH 19/19] Various fixes --- common/common.scss | 13 ----- desktop/desktop.scss | 19 ++++++- .../widgets/custom-header-dropdown.js.es6 | 2 +- .../widgets/custom-header-link.js.es6 | 25 ++++++++- mobile/mobile.scss | 55 ++++++------------- 5 files changed, 58 insertions(+), 56 deletions(-) diff --git a/common/common.scss b/common/common.scss index 96e5cac..22b35d1 100644 --- a/common/common.scss +++ b/common/common.scss @@ -29,19 +29,6 @@ } } - &:hover { - color: $main_link_hover_color; - - .custom-header-dropdown { - transform: scale(1); - transition-delay: 0s; - } - - .custom-header-link-caret svg { - transform: rotate(90deg); - } - } - &.with-url { cursor: pointer; } diff --git a/desktop/desktop.scss b/desktop/desktop.scss index 61629cd..fe39c06 100644 --- a/desktop/desktop.scss +++ b/desktop/desktop.scss @@ -2,4 +2,21 @@ @media screen and (max-width: 712px) { display: none; } -} + + .top-level-links { + .custom-header-link { + &:hover { + color: $main_link_hover_color; + + .custom-header-dropdown { + transform: scale(1); + transition-delay: 0s; + } + + .custom-header-link-caret svg { + transform: rotate(90deg); + } + } + } + } +} \ No newline at end of file diff --git a/javascripts/discourse/widgets/custom-header-dropdown.js.es6 b/javascripts/discourse/widgets/custom-header-dropdown.js.es6 index f21c7a4..ea6d212 100644 --- a/javascripts/discourse/widgets/custom-header-dropdown.js.es6 +++ b/javascripts/discourse/widgets/custom-header-dropdown.js.es6 @@ -25,7 +25,7 @@ createWidget('custom-header-dropdown', { click() { if (this.site.mobileView) { - this.sendWidgetAction("showHeaderLinks"); // in mobile view, close menu on click + this.sendWidgetAction("toggleDropdown"); // in mobile view, close menu on click } DiscourseURL.routeTo(this.attrs.url); }, diff --git a/javascripts/discourse/widgets/custom-header-link.js.es6 b/javascripts/discourse/widgets/custom-header-link.js.es6 index 3797727..d084ab0 100644 --- a/javascripts/discourse/widgets/custom-header-link.js.es6 +++ b/javascripts/discourse/widgets/custom-header-link.js.es6 @@ -9,6 +9,14 @@ createWidget("custom-header-link", { tagName: "li.custom-header-link", buildKey: (attrs) => `custom-header-link-${attrs.id}`, + defaultState() { + let showDropdown = false; + + return { + showDropdown, + }; + }, + html(attrs) { const iconHTML = buildIconHTML(attrs.icon); const titleHTML = h("span.custom-header-link-title", attrs.title); @@ -51,7 +59,7 @@ createWidget("custom-header-link", { }; }, - buildClasses(attrs) { + buildClasses(attrs, state) { const classes = []; if (attrs.url) { @@ -62,6 +70,10 @@ createWidget("custom-header-link", { classes.push("has-dropdown"); } + if (state.showDropdown) { + classes.push("show-dropdown"); + } + return classes; }, @@ -108,9 +120,18 @@ createWidget("custom-header-link", { return h("span.custom-header-link-caret", iconNode("caret-down")); }, + clickOutside() { + this.state.showDropdown = false; + this.scheduleRerender(); + }, + + toggleDropdown() { + this.state.showDropdown = !this.state.showDropdown; + }, + click() { if (this.site.mobileView) { - this.sendWidgetAction("showHeaderLinks"); // in mobile view, close menu on click + this.toggleDropdown(); } DiscourseURL.routeTo(this.attrs.url); }, diff --git a/mobile/mobile.scss b/mobile/mobile.scss index 56ee95c..9999df1 100644 --- a/mobile/mobile.scss +++ b/mobile/mobile.scss @@ -1,45 +1,22 @@ @import "mixins"; -/*.mobile-view { - .top-level-links { - @include dropdown; - position: fixed; - left: 0; - margin: 0; - top: var(--header-offset); - width: 100%; - flex-flow: row wrap; - align-items: flex-start; - justify-content: flex-start; - overflow: scroll; - max-height: 90vh; - - li { - width: 100%; - - @media screen and (min-width: 768px) { - width: auto; +.mobile-view { + .custom-header-links { + .top-level-links { + .custom-header-link { + &.show-dropdown { + color: $main_link_hover_color; + + .custom-header-dropdown { + transform: scale(1); + transition-delay: 0s; + } + + .custom-header-link-caret svg { + transform: rotate(90deg); + } + } } } } - - .custom-header-dropdown { - display: block; - position: initial; - transform: scale(1); - box-shadow: none; - margin-top: 1rem; - min-width: unset; - - .custom-header-link-desc { - display: none; - } - } - - .dropdown-header-open { - overflow-y: hidden; - height: 100vh; - position: fixed; - } } -*/