Merge branch 'discourse:main' into main

uzh-bf · Jun 29, 2024 · 2e766af · 2e766af
2 parents 622b9f3 + 6fcb8d5
commit 2e766af
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/about.json b/about.json
@@ -1,5 +1,5 @@
 {
-  "name": "Mint",
+  "name": "Mint Theme",
   "about_url": "https://meta.discourse.org/t/mint-a-modern-theme-for-discourse/202822",
   "license_url": "https://github.com/discourse/discourse-mint-theme/blob/main/LICENSE",
   "color_schemes": {

diff --git a/common/common.scss b/common/common.scss
@@ -27,6 +27,7 @@ input[type="color"],
 
 :root {
   --d-input-border-radius: var(--mint-border-radius);
+  --d-nav-underline-height: 0;
 }
 
 .d-header {
@@ -35,6 +36,10 @@ input[type="color"],
   border-bottom: 2px solid #dc6027;
 }
 
+.d-header-mode .bootstrap-mode {
+  color: var(--secondary);
+}
+
 .alert.alert-info {
   border-radius: 10px;
 }
@@ -125,9 +130,7 @@ a {
 }
 
 .category-boxes {
-  display: grid;
   grid-gap: 2em;
-  grid-template-columns: 32% 32% 32%;
   border-radius: var(--mint-border-radius);
   .category-box {
     width: 100%;
@@ -402,13 +405,16 @@ summary.select-kit-header.single-select-header.dropdown-select-box-header {
   display: none;
 }
 
-.showcased-topic-list {
+.custom-homepage-columns {
   display: none;
 }
 
 .mint-component-extensions {
-  .search-banner,
-  .showcased-topic-list {
+  .search-banner {
     display: block;
   }
+
+  .custom-homepage-columns {
+    display: flex;
+  }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -824,10 +824,11 @@ brace-expansion@^1.1.7:
     concat-map "0.0.1"
 
 braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 broccoli-debug@^0.6.5:
   version "0.6.5"
@@ -1699,9 +1700,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"