From 7112ed45e102163d37f3034a39f28e9646b8b627 Mon Sep 17 00:00:00 2001 From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com> Date: Fri, 17 Mar 2023 17:15:27 -0500 Subject: [PATCH 1/8] UX: Remove border radius on user nav (#25) --- common/common.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/common.scss b/common/common.scss index ebc2242d..ca657c8c 100644 --- a/common/common.scss +++ b/common/common.scss @@ -272,8 +272,8 @@ html body #main-outlet { } } -.nav-pills > li a.active, -.nav-pills > li > a { +.nav-pills:not(.user-nav) > li a.active, +.nav-pills:not(.user-nav) > li > a { border-radius: 0.5em; } From c2422a5102aed786b51fbac41f3549d7ae0ed519 Mon Sep 17 00:00:00 2001 From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com> Date: Mon, 27 Mar 2023 21:57:44 -0500 Subject: [PATCH 2/8] FIX: Chat mobile fix (#26) --- scss/chat-mobile.scss | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/scss/chat-mobile.scss b/scss/chat-mobile.scss index 2261801d..c2ed5021 100644 --- a/scss/chat-mobile.scss +++ b/scss/chat-mobile.scss @@ -1,14 +1,5 @@ -html body.has-full-page-chat #main-outlet.wrap { +html body.has-full-page-chat #main-outlet { width: 100% !important; padding: 0 !important; background-color: var(--secondary) !important; } - -html body.chat-enabled #main-outlet { - width: 100% !important; - padding: 0 !important; - background-color: var(--secondary) !important; - .chat-channels { - height: var(--full-page-chat-height); - } -} From 9c61a6b8398bce4807a5925825756f7664c33ea4 Mon Sep 17 00:00:00 2001 From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com> Date: Tue, 16 May 2023 15:30:16 -0500 Subject: [PATCH 3/8] UX: Multiple adjustments for mobile search UI (#29) * UX: Multiple adjustments for mobile search UI * prettier --- mobile/mobile.scss | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/mobile/mobile.scss b/mobile/mobile.scss index d149c348..f1115315 100644 --- a/mobile/mobile.scss +++ b/mobile/mobile.scss @@ -113,3 +113,36 @@ ol.category-breadcrumb { border-radius: 0.25em; margin-top: 1em; } + +.search-container .search-advanced .search-results { + padding: none; +} + +.fps-result { + background: var(--secondary); + padding: 1em; + border-radius: 8px; + box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05); + border: 1px solid rgba(var(--primary-rgb), 0.1); + margin-bottom: 0.5em; +} + +.search-container .search-header { + border-top-right-radius: 8px; + border-top-left-radius: 8px; +} + +.search-container .search-advanced .search-info { + padding-right: 1em; + padding-left: 1em; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; +} + +.full-width .contents .topic-list .topic-list-header tr { + background-color: var(--secondary); + border-radius: 8px; + box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05); + border: 1px solid rgba(var(--primary-rgb), 0.1); + margin-bottom: 1em; +} From 882390cc78732e4f939af30d9ec243adcc365b38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 10:48:46 +0200 Subject: [PATCH 4/8] Bump semver from 6.3.0 to 6.3.1 (#32) Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 462cc800..ba94d808 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1694,9 +1694,9 @@ safe-buffer@~5.2.0: integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== semver@^6.1.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== shebang-command@^2.0.0: version "2.0.0" From 3a45f9e281c63916bc1b5c590f681c55bb1aa597 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 10:19:10 +0200 Subject: [PATCH 5/8] Bump word-wrap from 1.2.3 to 1.2.4 (#33) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ba94d808..08c5e861 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1881,9 +1881,9 @@ which@^2.0.1: isexe "^2.0.0" word-wrap@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + version "1.2.4" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" + integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== workerpool@^6.1.5: version "6.2.1" From 1e5882a1541b932f9512f6a7d667b333c1708f53 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 17 Aug 2023 15:16:31 -0400 Subject: [PATCH 6/8] UX: search banner and chat styles, remove slider (#34) --- about.json | 1 - common/common.scss | 18 ++++++++++++++++++ scss/chat-desktop.scss | 12 ++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/about.json b/about.json index 6e2b289d..26e8229b 100644 --- a/about.json +++ b/about.json @@ -4,7 +4,6 @@ "license_url": null, "components": [ "https://github.com/jordanvidrine/discourse-category-group-boxes.git", - "https://github.com/discourse/discourse-loading-slider.git", "https://github.com/discourse/discourse-clickable-topic.git", "https://github.com/discourse/discourse-search-banner.git" ], diff --git a/common/common.scss b/common/common.scss index ca657c8c..f862fa85 100644 --- a/common/common.scss +++ b/common/common.scss @@ -55,6 +55,24 @@ } } +// Ideally the search banner component should be set to use the below-site-header outlet, +// but this ensures the default works too +.above-main-container-outlet.search-banner { + .custom-search-banner-wrap { + padding: 1em 0 2em; + color: var(--tertiary); + .mobile-view & { + color: var(--secondary); + } + h1 { + margin-bottom: 0; + } + .search-widget { + margin-top: 2em; + } + } +} + // Main customizations .alert { margin: 1em 0; diff --git a/scss/chat-desktop.scss b/scss/chat-desktop.scss index 1c6c46b2..ca894bf0 100644 --- a/scss/chat-desktop.scss +++ b/scss/chat-desktop.scss @@ -11,6 +11,18 @@ html body.has-sidebar-page.has-full-page-chat { border: none !important; } +.chat-channel { + height: calc(100vh - (var(--header-offset) + 6em)); +} + +.chat-composer__wrapper { + background: transparent; +} + +.full-page-chat .chat-full-page-header { + border-radius: 1em 1em 0 0; +} + .has-full-page-chat #main-outlet.wrap { margin-bottom: 30px; padding-bottom: 0px !important; From cc606b50d4e99e6e1dceea8de1d4e826d873bb99 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Tue, 22 Aug 2023 15:00:53 -0400 Subject: [PATCH 7/8] DEV: Pin theme for Discourse 3.1 stable (#35) --- .discourse-compatibility | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .discourse-compatibility diff --git a/.discourse-compatibility b/.discourse-compatibility new file mode 100644 index 00000000..0378769f --- /dev/null +++ b/.discourse-compatibility @@ -0,0 +1,2 @@ +3.1.999: 1e5882a1541b932f9512f6a7d667b333c1708f53 + From 70ab413301b15a7ad54dc3f760bcb6f054a3d91e Mon Sep 17 00:00:00 2001 From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com> Date: Wed, 30 Aug 2023 05:36:17 -0500 Subject: [PATCH 8/8] FIX: Fix mobile issues (#36) --- common/common.scss | 4 ++++ mobile/mobile.scss | 32 +++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/common/common.scss b/common/common.scss index f862fa85..d3adb538 100644 --- a/common/common.scss +++ b/common/common.scss @@ -109,6 +109,10 @@ } } +.discourse-tags { + gap: 0.5em; +} + .discourse-tag { font-size: $font-down-1; border-radius: 0.25em; diff --git a/mobile/mobile.scss b/mobile/mobile.scss index f1115315..7b9ae344 100644 --- a/mobile/mobile.scss +++ b/mobile/mobile.scss @@ -84,7 +84,6 @@ ol.category-breadcrumb { .topic-list .topic-list-data { padding: 1em 1em 0 1em; - width: calc(100% - 2em); max-width: unset; } @@ -146,3 +145,34 @@ ol.category-breadcrumb { border: 1px solid rgba(var(--primary-rgb), 0.1); margin-bottom: 1em; } + +.topic-list .topic-item-stats { + flex-wrap: wrap; +} + +.topic-list-item .discourse-tags { + order: 3; + width: 100%; + margin-top: 0.5em; +} + +.full-width .contents .topic-list .topic-list-item .posts-map { + padding: 0; + .number { + margin: 0; + } +} + +.full-width + .contents + .topic-list + .topic-list-body + .topic-list-item + .topic-list-data.posts { + width: unset; +} + +.topic-list .topic-list-header .topic-list-data, +.topic-list .topic-list-item .topic-list-data { + padding: 15px; +}