Merge remote-tracking branch 'upstream/main'

.discourse-compatibility

@@ -1,2 +1,2 @@
+< 3.3.0.beta1-dev: 85dc24d6b58d1b16e6d225ae710633dc20c34d08
 3.1.999: 1e5882a1541b932f9512f6a7d667b333c1708f53
-

.eslintrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/eslint-theme");

.github/workflows/discourse-theme.yml

@@ -0,0 +1,11 @@
+name: Discourse Theme
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  ci:
+    uses: discourse/.github/.github/workflows/discourse-theme.yml@v1

.prettierrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/prettier");

.template-lintrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/template-lint");

common/common.scss

@@ -150,6 +150,10 @@
   }
 }
 
+.not-found-container {
+  background-color: var(--secondary);
+}
+
 input[type="text"],
 input[type="password"],
 input[type="datetime"],
@@ -247,7 +251,7 @@ div.ac-wrap {
 }
 
 html {
-  body {
+  body:not(.no-ember) {
     background: linear-gradient(
         0deg,
         rgba(var(--primary-rgb), 0.075) 0%,
@@ -268,6 +272,9 @@ html {
     );
     clip-path: ellipse(148% 70% at 91% -14%);
   }
+  body.no-ember .background-container {
+    display: none;
+  }
 }
 
 html body #main-outlet {
@@ -299,6 +306,23 @@ html body #main-outlet {
   border-radius: 0.5em;
 }
 
+.category-calendar {
+  &.before-topic-list-body-outlet {
+    display: block;
+  }
+  background: var(--secondary);
+  padding: 1em;
+  border-radius: 8px;
+  margin-bottom: 1em;
+}
+
+.discourse-post-event-upcoming-events {
+  background: var(--secondary);
+  border-radius: 8px;
+  padding: 1em;
+  margin-bottom: 1em;
+}
+
 // Topic List
 
 @keyframes background-fade-highlight {
@@ -533,7 +557,6 @@ html body #main-outlet {
 }
 
 .quote-button {
-  background-color: var(--primary-low-mid);
   border-radius: 0.5em;
 }
 
@@ -559,4 +582,8 @@ html body #main-outlet {
   box-shadow: none;
 }
 
+.title-voting {
+  padding-left: 14px;
+}
+
 @import "vatsim";

javascripts/discourse/initializers/customize-edit-category-general.js

@@ -1,5 +1,5 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
 import { cancel } from "@ember/runloop";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 export default {
   name: "customize-edit-category-general",

mobile/mobile.scss

@@ -11,15 +11,31 @@
 }
 
 html
-  body:not(.static-tos):not(.static-faq):not(.static-privacy):not(.about-page):not(.static-faq):not(.badges-page):not(.tags-page):not(.archetype-banner):not(.archetype-regular):not(.archetype-private_message):not(.admin-interface):not(.edit-category):not(.user-summary-page):not(.user-activity-page):not(.user-invites-page):not(.user-preferences-page)
+  body:not(.static-tos):not(.static-faq):not(.static-privacy):not(
+    .about-page
+  ):not(.static-faq):not(.badges-page):not(.tags-page):not(
+    .archetype-banner
+  ):not(.archetype-regular):not(.archetype-private_message):not(
+    .admin-interface
+  ):not(.edit-category):not(.user-summary-page):not(.user-activity-page):not(
+    .user-invites-page
+  ):not(.user-preferences-page):not(.user-messages-page):not(
+    .user-notifications-page
+  ):not(.user-badges-page)
   #main-outlet {
   width: calc(100% - 1em);
   padding: 0em 0.5em 1em 0.5em;
   box-shadow: none;
   background-color: transparent;
 }
 
+html body #main-outlet .docs {
+  padding: 1em;
+  background-color: var(--secondary);
+}
+
 html body.static-tos #main-outlet,
+html body.no-ember #main-outlet,
 html body.static-privacy #main-outlet,
 html body.about-page #main-outlet,
 html body.static-faq #main-outlet,
@@ -33,6 +49,9 @@ html body.user-summary-page #main-outlet,
 html body.user-activity-page #main-outlet,
 html body.user-invites-page #main-outlet,
 html body.user-preferences-page #main-outlet,
+html body.user-messages-page #main-outlet,
+html body.user-notifications-page #main-outlet,
+html body.user-badges-page #main-outlet,
 html body.staff:not(.navigation-topics) #main-outlet {
   border-radius: 0px;
   width: calc(100% - 3em);
@@ -64,6 +83,12 @@ ol.category-breadcrumb {
   margin-top: 1em;
 }
 
+.categories-list .list-controls {
+  background: var(--secondary);
+  padding: 0.5em;
+  border-radius: 8px;
+}
+
 .list-controls .nav-pills {
   li.navigation-toggle {
     border-radius: 8px;
@@ -176,3 +201,21 @@ ol.category-breadcrumb {
 .topic-list .topic-list-item .topic-list-data {
   padding: 15px;
 }
+
+// default category list styles when the modern category boxes theme component isn't used
+
+.category-list-item.category {
+  background: var(--secondary);
+  border-radius: 1em;
+  tbody {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+  }
+  td {
+    width: 100%;
+  }
+  .num.posts {
+    padding-right: 0.25em;
+  }
+}