Fix padding on become and editor button

Bumps [rack](https://github.com/rack/rack) from 3.1.8 to 3.1.10.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v3.1.8...v3.1.10)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.discourse-compatibility

@@ -1,2 +1,5 @@
+< 3.5.0.beta1-dev: 83e2797ceb40d9832a40ee8c4bc32c7127e9dcda
+< 3.4.0.beta4-dev: a5ff3374335f17b46654c4ae1e5be7b539c2da1a
+< 3.4.0.beta1-dev: 93551f55d6e9f8d688f1f9dc0b6a2f14eb08b603
+< 3.3.0.beta1-dev: 85dc24d6b58d1b16e6d225ae710633dc20c34d08
 3.1.999: 1e5882a1541b932f9512f6a7d667b333c1708f53
-

.eslintrc

@@ -1,8 +0,0 @@
-{
-  "extends": "eslint-config-discourse",
-  "ignorePatterns": ["javascripts/vendor/*"],
-  "globals": {
-    "settings": "readonly",
-    "themePrefix": "readonly"
-  }
-}

.github/workflows/component-linting.yml

@@ -1,48 +0,0 @@
-name: Linting
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-concurrency:
-  group: plugin-linting-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: yarn
-
-      - name: Yarn install
-        run: yarn install
-
-      - name: ESLint
-        if: ${{ always() }}
-        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,javascripts}
-
-      - name: Prettier
-        if: ${{ always() }}
-        shell: bash
-        run: |
-          yarn prettier -v
-          files=$(find javascripts desktop mobile common scss -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null) || true
-          if [ -n "$files" ]; then
-            yarn prettier --list-different $files
-          fi
-          if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
-            yarn prettier --list-different "test/**/*.{js,es6}"
-          fi
-
-      - name: Ember template lint
-        if: ${{ always() }}
-        run: yarn ember-template-lint --no-error-on-unmatched-pattern javascripts

.github/workflows/component-tests.yml

@@ -1,147 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-concurrency:
-  group: plugin-tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
-  cancel-in-progress: true
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    outputs:
-      tests_exist: ${{ steps.check_tests.outputs.tests_exist }}
-
-    steps:
-      - name: Install component
-        uses: actions/checkout@v3
-        with:
-          path: tmp/component
-          fetch-depth: 1
-
-      - name: Check QUnit existence
-        id: check_tests
-        shell: bash
-        run: |
-          if [ 0 -lt $(find tmp/component/test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
-            echo "::set-output name=tests_exist::true"
-          fi
-
-  test:
-    needs: check
-    if: ${{ needs.check.outputs.tests_exist }}
-    runs-on: ubuntu-latest
-    container: discourse/discourse_test:slim-browsers
-    timeout-minutes: 15
-
-    env:
-      DISCOURSE_HOSTNAME: www.example.com
-      RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
-      RAILS_ENV: development
-      PGUSER: discourse
-      PGPASSWORD: discourse
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: discourse/discourse
-          fetch-depth: 1
-
-      - name: Install component
-        uses: actions/checkout@v3
-        with:
-          path: tmp/component
-          fetch-depth: 1
-
-      - name: Setup Git
-        run: |
-          git config --global user.email "ci@ci.invalid"
-          git config --global user.name "Discourse CI"
-
-      - name: Start redis
-        run: |
-          redis-server /etc/redis/redis.conf &
-
-      - name: Start Postgres
-        run: |
-          chown -R postgres /var/run/postgresql
-          sudo -E -u postgres script/start_test_db.rb
-          sudo -u postgres psql -c "CREATE ROLE $PGUSER LOGIN SUPERUSER PASSWORD '$PGPASSWORD';"
-
-      - name: Bundler cache
-        uses: actions/cache@v3
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gem-
-
-      - name: Setup gems
-        run: |
-          gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' Gemfile.lock)
-          bundle config --local path vendor/bundle
-          bundle config --local deployment true
-          bundle config --local without development
-          bundle install --jobs 4
-          bundle clean
-
-      - name: Lint English locale
-        run: bundle exec ruby script/i18n_lint.rb "tmp/component/locales/en.yml"
-
-      - name: Get yarn cache directory
-        id: yarn-cache-dir
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: Yarn cache
-        uses: actions/cache@v3
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Yarn install
-        run: yarn install
-
-      - name: Fetch app state cache
-        uses: actions/cache@v3
-        id: app-cache
-        with:
-          path: tmp/app-cache
-          key: >-
-            ${{ hashFiles('.github/workflows/tests.yml') }}-
-            ${{ hashFiles('db/**/*', 'plugins/**/db/**/*') }}-
-
-      - name: Restore database from cache
-        if: steps.app-cache.outputs.cache-hit == 'true'
-        run: psql -f tmp/app-cache/cache.sql postgres
-
-      - name: Restore uploads from cache
-        if: steps.app-cache.outputs.cache-hit == 'true'
-        run: rm -rf public/uploads && cp -r tmp/app-cache/uploads public/uploads
-
-      - name: Create and migrate database
-        if: steps.app-cache.outputs.cache-hit != 'true'
-        run: |
-          bin/rake db:create
-          bin/rake db:migrate
-
-      - name: Dump database for cache
-        if: steps.app-cache.outputs.cache-hit != 'true'
-        run: mkdir -p tmp/app-cache && pg_dumpall > tmp/app-cache/cache.sql
-
-      - name: Dump uploads for cache
-        if: steps.app-cache.outputs.cache-hit != 'true'
-        run: rm -rf tmp/app-cache/uploads && cp -r public/uploads tmp/app-cache/uploads
-
-      - name: Component QUnit
-        run: |
-          THEME_NAME=$(ruby -e 'require "json"; puts JSON.parse(File.read("tmp/component/about.json"))["name"]')
-          bundle exec rake themes:install -- "--{\"$THEME_NAME\": \"tmp/component\"}"
-          UNICORN_TIMEOUT=120 bundle exec rake "themes:qunit[name,$THEME_NAME]"
-        timeout-minutes: 10

.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

.npmrc

@@ -0,0 +1,2 @@
+engine-strict = true
+auto-install-peers = false

.prettierrc

@@ -1 +0,0 @@
-{}

.prettierrc.cjs

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

.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_gem:
+  rubocop-discourse: stree-compat.yml

.streerc

@@ -0,0 +1,2 @@
+--print-width=100
+--plugins=plugin/trailing_comma,plugin/disable_auto_ternary

.template-lintrc.cjs

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

.template-lintrc.js

@@ -1,4 +0,0 @@
-module.exports = {
-  plugins: ["ember-template-lint-plugin-discourse"],
-  extends: "discourse:recommended",
-};

Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+group :development do
+  gem "rubocop-discourse"
+  gem "syntax_tree"
+end

Gemfile.lock

@@ -0,0 +1,101 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.2)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
+    drb (2.2.1)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.6.6)
+    minitest (5.25.5)
+    parallel (1.26.3)
+    parser (3.3.7.1)
+      ast (~> 2.4.1)
+      racc
+    prettier_print (1.2.1)
+    racc (1.8.1)
+    rack (3.1.12)
+    rainbow (3.1.1)
+    regexp_parser (2.10.0)
+    rubocop (1.74.0)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.39.0)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-discourse (3.12.1)
+      activesupport (>= 6.1)
+      lint_roller (>= 1.1.0)
+      rubocop (>= 1.73.2)
+      rubocop-capybara (>= 2.22.0)
+      rubocop-factory_bot (>= 2.27.0)
+      rubocop-rails (>= 2.30.3)
+      rubocop-rspec (>= 3.0.1)
+      rubocop-rspec_rails (>= 2.31.0)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rails (2.30.3)
+      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
+      rack (>= 1.1)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    syntax_tree (6.2.0)
+      prettier_print (>= 1.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+
+PLATFORMS
+  arm64-darwin-23
+  ruby
+
+DEPENDENCIES
+  rubocop-discourse
+  syntax_tree
+
+BUNDLED WITH
+   2.6.6

about.json

@@ -1,39 +1,36 @@
 {
-  "name": "Air Theme",
+  "name": "OrcasHub Theme",
-  "about_url": null,
+  "about_url": "https://meta.discourse.org/t/discourse-air-theme/197703",
-  "license_url": null,
+  "license_url": "https://github.com/discourse/discourse-air/blob/main/LICENSE",
   "components": [
     "https://github.com/jordanvidrine/discourse-category-group-boxes.git",
     "https://github.com/discourse/discourse-clickable-topic.git",
-    "https://github.com/discourse/discourse-search-banner.git"
+    "https://github.com/discourse/discourse-custom-header-links.git",
+    "https://git.grosinger.net/tgrosinger/discourse-user-card-directory.git",
+    "https://github.com/discourse/DiscoTOC.git",
+    "https://github.com/paviliondev/discourse-tc-topic-list-previews.git"
   ],
+  "assets": {
+    "OrcasHub-Top-Logo": "assets/OrcasHub-Top-Logo.png"
+  },
   "modifiers": {
     "serialize_topic_excerpts": true
   },
   "color_schemes": {
-    "air-light": {
+    "OrcasHub": {
       "primary": "1c1c1c",
-      "secondary": "f9fcff",
+      "secondary": "ffffff",
       "tertiary": "3877e5",
       "quaternary": "7e8b93",
-      "header_background": "f9fcff",
+      "header_background": "374151",
-      "header_primary": "122b43",
+      "header_primary": "e0e0e0",
       "highlight": "e6cb37",
       "danger": "d05454",
       "success": "71bd9f",
-      "love": "c16ad7"
+      "love": "c16ad7",
+      "selected": "2f0177",
+      "hover": "535353"
+    }
   },
-    "air-dark": {
+  "screenshots": ["screenshots/light.png", "screenshots/dark.png"]
-      "primary": "e0e0e0",
-      "secondary": "2d2d2d",
-      "tertiary": "9a5cfd",
-      "quaternary": "71bd9f",
-      "header_background": "202020",
-      "header_primary": "e0e0e0",
-      "highlight": "9a5cfd",
-      "danger": "d05454",
-      "success": "71bd9f",
-      "love": "c16ad7"
-    }
-  }
 }

common/after_header.html

@@ -0,0 +1,9 @@
+<div id="login-message">
+    <h2>
+    There are a lot more discussions going on if you log in!
+    </h2>
+
+    <a href="/login" class="widget-button btn btn-primary btn-small sign-up-button btn-text">
+        <span class="d-button-label">Log in or Sign Up</span>
+    </a>
+</div>

common/common.scss

@@ -1,44 +1,107 @@
+// Login CTA
+#login-message {
+    display: none;
+}
+
+html.anon {
+    body:not(.category-resources) {
+        // Display this message on all pages except in Community Resources
+        #login-message {
+            text-align: center;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            margin: 16px 0;
+
+            a:hover {
+                color: var(--secondary-very-high);
+            }
+        }
+    }
+}
+
+// Login form
+.login-right-side {
+    display: none;
+}
+
+// Header image above nav bar
+.outer {
+    padding-top: 1.5rem;
+    padding-bottom: 1.5rem;
+    display: flex;
+    justify-content: center;
+    background-color: var(--header_background);
+}
+
+.top-header-image {
+    background-image: url($OrcasHub-Top-Logo);
+}
+
+// Hide the default logo in the header bar
+#site-logo,
+.home-logo-wrapper-outlet {
+    display: none;
+}
+
 // custom search banner customizations
 .custom-search-banner-wrap {
   margin: 0 auto !important;
   max-width: unset;
   color: var(--secondary);
+
   h1 {
+    line-height: var(--line-height-small);
+
+    @include breakpoint("large", min-width) {
       font-size: 4em;
     }
-  p {
-    font-size: 1.25em !important;
-    font-weight: bold;
-    margin-bottom: 1em;
   }
+
+  p {
+    margin-top: 0.5em;
+    margin-bottom: 2em;
+
+    @include breakpoint("large", min-width) {
+      font-size: var(--font-up-1);
+    }
+  }
+
   .btn {
     height: 100%;
   }
+
   .search-menu input[type="text"] {
     border: 1px solid transparent;
     border-radius: 0.25em;
     min-height: 40px;
+
     &:focus {
       outline: 3px solid rgba(var(--primary-rgb), 0.35);
     }
   }
+
   .widget-link.show-help {
     color: rgba(var(--primary-rgb), 0.75);
     border-radius: 0.5em;
     padding: 0.5em;
     background-color: rgba(var(--secondary-rgb), 0.25);
+
     &:hover {
       color: var(--primary);
     }
   }
+
   .search-menu .search-input {
     border-color: var(--tertiary-hover);
     outline: 1px solid var(--tertiary-hover);
   }
+
   .results {
     top: 43px;
     border-radius: 0.25em;
   }
+
   .search-context {
     top: 3.25em;
     right: 1em;
@@ -61,12 +124,15 @@
   .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;
     }
@@ -97,12 +163,14 @@
   .badge-category-bg {
     border-radius: 0.125em;
   }
+
   .badge-category-parent-bg {
     border-top-left-radius: 0.125em;
     border-bottom-left-radius: 0.125em;
+
     + .badge-category-bg {
-      border-top-left-radius: 0px;
+      border-top-left-radius: 0;
-      border-bottom-left-radius: 0px;
+      border-bottom-left-radius: 0;
       border-top-right-radius: 0.125em;
       border-bottom-right-radius: 0.125em;
     }
@@ -119,6 +187,7 @@
   padding: 0.15em 0.25em 0.15em 0.35em;
   background-color: var(--primary-low);
   color: var(--primary) !important;
+
   &:hover {
     background-color: var(--primary-low-mid);
     color: var(--primary);
@@ -132,11 +201,26 @@
   margin-left: unset;
 }
 
-.topic-list .link-bottom-line .discourse-tag.simple:after,
+.topic-list .link-bottom-line .discourse-tag.simple::after,
 .topic-list .link-bottom-line .discourse-tag.box {
-  margin-right: 0px;
+  margin-right: 0;
 }
 
+.custom-category-boxes {
+    .category-box {
+        box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px,
+            rgba(0, 0, 0, 0) 0px 0px 0px 0px,
+            rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
+            rgba(0, 0, 0, 0.1) 0px 1px 2px -1px !important;
+    }
+
+    .category-logo {
+        height: 100px !important;
+        width: 100px !important;
+    }
+}
+
+
 #site-text-logo {
   color: var(--primary);
 }
@@ -145,11 +229,16 @@
   .cm-header-links {
     display: none;
   }
+
   .list-controls .nav-pills .drop li:first-of-type {
     display: none;
   }
 }
 
+.not-found-container {
+  background-color: var(--secondary);
+}
+
 input[type="text"],
 input[type="password"],
 input[type="datetime"],
@@ -169,6 +258,7 @@ input[type="color"],
 div.ac-wrap {
   border-radius: 4px;
 }
+
 .d-header {
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.06);
 }
@@ -181,6 +271,7 @@ div.ac-wrap {
   border-radius: 0.25em;
   margin-left: 0.3em;
   border: 1px solid transparent;
+
   svg {
     font-size: 1.25em;
   }
@@ -198,6 +289,7 @@ div.ac-wrap {
 
 .drop-down-mode .d-header-icons .active .icon {
   border: 1px solid transparent;
+
   .d-icon {
     color: var(--tertiary);
   }
@@ -214,15 +306,15 @@ div.ac-wrap {
   background-color: rgba(var(--tertiary-rgb), 0.5);
 }
 
-.btn:not(.themes-tab):not(.components-tab),
+.btn:not(.themes-tab, .components-tab),
 .select-kit.dropdown-select-box .dropdown-select-box-header {
-  border-radius: 8px;
+  border-radius: .375rem;
   border: 1px solid transparent;
 }
 
 .post-admin-menu.popup-menu {
   .btn.widget-button {
-    border-radius: 0px;
+    border-radius: 0;
   }
 }
 
@@ -238,35 +330,9 @@ div.ac-wrap {
   border-left-color: var(--tertiary);
 }
 
-// graceful ish style
-@mixin box-shadow($value: 0px) {
-  box-shadow: 0 24px 40px rgba(0, 0, 0, 0.07),
-    0 10.8529px 24.1177px rgba(0, 0, 0, 0.0456112),
-    0 4.50776px 10.0172px rgba(0, 0, 0, 0.035),
-    0 1.63037px 3.62304px rgba(0, 0, 0, 0.0243888);
-}
-
 html {
   body {
-    background: linear-gradient(
+    background-color: var(--secondary);
-        0deg,
-        rgba(var(--primary-rgb), 0.075) 0%,
-        rgba(var(--primary-rgb), 0.075) 100%
-      ),
-      linear-gradient(0deg, var(--secondary) 100%, var(--secondary) 100%);
-  }
-  .background-container {
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 100vh;
-    width: 100vw;
-    background: linear-gradient(
-      90deg,
-      var(--tertiary-hover) 0%,
-      var(--tertiary) 100%
-    );
-    clip-path: ellipse(148% 70% at 91% -14%);
   }
 }
 
@@ -274,24 +340,32 @@ html body #main-outlet {
   margin-top: 30px;
   margin-bottom: 50px;
   background: var(--secondary);
-  border-radius: 1em;
+  border-radius: .5rem;
   padding: 3em 3em 5%;
   max-width: 1150px;
-  .archetype-regular & {
+  padding-bottom: 5% !important; // overriding inline style
-    min-height: 500px;
+  box-shadow:
-  }
+    0 24px 40px rgba(0, 0, 0, 0.07),
+    0 10.8529px 24.1177px rgba(0, 0, 0, 0.0456112),
+    0 4.50776px 10.0172px rgba(0, 0, 0, 0.035),
+    0 1.63037px 3.62304px rgba(0, 0, 0, 0.0243888);
+
   @media screen and (max-width: 700px) {
     padding: 1.5em;
     margin-top: 0;
   }
-  padding-bottom: 5% !important; //overriding inline style
+
-  @include box-shadow;
   @media screen and (max-width: 1120px) {
     width: 80%;
   }
+
   @media screen and (max-width: 1075px) {
     width: 85%;
   }
+
+  .archetype-regular & {
+    min-height: 500px;
+  }
 }
 
 .nav-pills:not(.user-nav) > li a.active,
@@ -299,12 +373,65 @@ 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;
+}
+
+// User directory (people)
+
+.users-directory {
+    .directory-controls {
+        justify-content: right !important;
+    }
+
+    .period-controls {
+        display: none;
+    }
+}
+
+// User Card (profile)
+
+.user-card {
+  .badge-section,
+  .metadata-row {
+      display: none;
+}
+
+// Category List
+
+.custom-category-boxes-container {
+    .custom-category-boxes {
+        .category-box {
+            border-radius: .5rem !important;
+        }
+    }
+}
+
+// Hide the "about this category" heading
+.category-heading {
+    display: none;
+}
+
 // Topic List
 
 @keyframes background-fade-highlight {
   0% {
     background-color: var(--highlight-low);
   }
+
   100% {
     background-color: var(--secondary);
   }
@@ -314,71 +441,87 @@ html body #main-outlet {
   border-collapse: separate;
   border-spacing: 0 0.25em;
   display: contents;
+
   .topic-list-header {
     tr {
       display: flex;
       border-bottom: none;
     }
     display: contents;
+
     .topic-list-data.default {
       width: 63%;
     }
+
     .topic-list-data.posters {
       width: 7%;
     }
+
     .topic-list-data.posts {
       width: 15%;
     }
+
     .topic-list-data.activity {
       width: 15%;
     }
   }
+
   .topic-list-body {
     display: contents;
+
     .topic-list-item-separator {
       width: 100%;
       margin: 0.75em 0;
       display: flex;
+
       .topic-list-data {
         width: 100%;
       }
     }
+
     .topic-list-item {
-      width: 100%;
       display: flex;
       margin-bottom: 0.5em;
       background-color: var(--secondary);
       border: 1px solid rgba(var(--primary-rgb), 0.2);
-      border-radius: 1em;
+      border-radius: .5rem;
       position: relative;
       transition: box-shadow 100ms ease-in-out;
-      box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05);
+      box-shadow: 0 0 8px rgba(0, 0, 0, 0.05);
       overflow: hidden;
+
       &.visited {
         border: 1px solid rgba(var(--primary-rgb), 0.1);
+
         .discourse-tag {
           opacity: 0.75;
         }
+
         &:hover {
           border: 1px solid rgba(var(--primary-rgb), 0.25);
+
           .discourse-tag {
             opacity: 1;
           }
         }
       }
+
       &:hover {
         background-color: var(--secondary);
-        box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
+        box-shadow: 0 0 12px rgba(0, 0, 0, 0.1);
         border: 1px solid rgba(var(--primary-rgb), 0.3);
+
         a.title:not(.badge-notification),
         a.topic-excerpt {
           color: var(--primary) !important;
         }
       }
+
       .topic-list-data.main-link {
         width: 63%;
         order: 2;
       }
+
       .topic-list-data.posters {
         width: 7%;
         order: 1;
@@ -386,10 +529,12 @@ html body #main-outlet {
         display: flex;
         justify-content: center;
         align-items: center;
+
         a:not(.latest) {
           display: none;
         }
       }
+
       .topic-list-data.posts {
         width: 15%;
         order: 3;
@@ -397,6 +542,7 @@ html body #main-outlet {
         justify-content: center;
         align-items: center;
       }
+
       .topic-list-data.age {
         width: 15%;
         order: 4;
@@ -404,6 +550,101 @@ html body #main-outlet {
         justify-content: center;
         align-items: center;
       }
+
+      &.selected {
+        td:nth-of-type(1) {
+          box-shadow: none;
+        }
+
+        &:focus-visible td:nth-of-type(2) {
+          box-shadow: inset 3px 0 0 var(--tertiary);
+          border-radius: calc(1em - 3px);
+        }
+      }
+    }
+
+    .main-link {
+      min-height: 100%;
+
+      .link-top-line {
+        display: block;
+        margin-bottom: 0.25em;
+      }
+
+      .title {
+        font-weight: bold;
+      }
+
+      .link-area {
+        display: flex;
+
+        .link-title-area {
+          margin-right: 1em;
+          font-size: $font-up-1;
+        }
+
+        .link-meta-area {
+          font-size: $font-down-3;
+          display: flex;
+          align-items: center;
+        }
+      }
+    }
+
+    .posters {
+      .avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: .375rem;
+      }
+
+      a.latest {
+        margin-right: 4px;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-content: center;
+        align-items: center;
+
+        .avatar {
+          margin-right: 0;
+        }
+      }
+
+      a:not(.latest) {
+        margin-left: -22px;
+
+        .avatar {
+          border: 3px solid var(--secondary);
+        }
+      }
+    }
+
+    .posts-map,
+    .num.age.activity {
+      a {
+        padding: 0;
+      }
+    }
+
+    .posts-map {
+      position: relative;
+
+      .number {
+        margin-right: 0.25em;
+      }
+    }
+
+    .post-activity {
+      .d-icon-reply {
+        color: var(--primary-medium);
+        margin-right: 0.25em;
+      }
+
+      .relative-date {
+        color: var(--primary-medium);
+      }
     }
   }
 }
@@ -412,110 +653,111 @@ html body #main-outlet {
   display: none;
 }
 
-.full-width .contents .topic-list .topic-list-item .posters a.latest {
+.d-icon-lock {
-  margin-right: 4px;
+    display: none;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-content: center;
-  align-items: center;
-  .avatar {
-    margin-right: 0;
-  }
 }
 
-.full-width .contents .topic-list {
+// Community Resources Category
-  .topic-list-item {
+.category-resources {
-    .main-link {
+    // Topic List
-      min-height: 100%;
+
-      min-height: 100%;
+    .topic-list-header {
-      .link-top-line {
+        display: none !important;
-        display: block;
-        margin-bottom: 0.25em;
     }
-      .title {
+
-        font-weight: bold;
+    .topic-list-body {
-      }
+        .topic-list-data {
-      .link-area {
+            // Center content in the topic list
-        display: flex;
-        .link-title-area {
-          margin-right: 1em;
-          font-size: $font-up-1;
-        }
-        .link-meta-area {
-          font-size: $font-down-3;
             display: flex;
             align-items: center;
         }
-      }
+
-    }
+        .num.views,
-    .posters {
+        .num.posts,
-      .avatar {
+        .num.activity,
-        width: 40px;
+        .posters,
-        height: 40px;
+        .topic-statuses {
-        border-radius: 8px;
+            display: none !important;
-      }
-      a.latest {
-        .avatar {
-          margin-right: 0;
-        }
-      }
-      a:not(.latest) {
-        margin-left: -22px;
-        .avatar {
-          border: 3px solid var(--secondary);
-        }
-      }
-    }
-    .posts-map,
-    .num.age.activity {
-      a {
-        padding: 0;
-      }
-    }
-    .posts-map {
-      position: relative;
-      .number {
-        margin-right: 0.25em;
-      }
-    }
-    .post-activity {
-      .d-icon-reply {
-        color: var(--primary-medium);
-        margin-right: 0.25em;
-      }
-      .relative-date {
-        color: var(--primary-medium);
-      }
-    }
         }
     }
 
-.navigation-container {
+    // Topic Posts
-  margin-top: 2em;
+
+    .topic-map,
+    .topic-avatar,
+    .more-topics__container,
+    .names.trigger-user-card { // Hide the lock icon in the topic header of the post
+        display: none !important;
     }
 
-// published page additions
+    .topic-meta-data {
-.published-page-content-wrapper {
+        display: flex;
+        justify-content: right;
+    }
+}
+
+.become-editor-link {
+    display: none;
+    margin: -40px auto 30px auto;
+    padding-left: 3em;
     max-width: 1000px;
-  margin-top: 30px;
+
-  margin-bottom: 50px;
+    a {
-  background: var(--secondary);
+        color: var(--primary-high);
-  border-radius: 1em;
+        text-decoration: underline;
-  padding: 3em 3em 5%;
+    }
-  box-shadow: 0 24px 40px rgba(0, 0, 0, 0.07),
+
-    0 10.8529px 24.1177px rgba(0, 0, 0, 0.0456112),
+    a:visited {
-    0 4.50776px 10.0172px rgba(0, 0, 0, 0.035),
+        color: var(--primary-high);
-    0 1.63037px 3.62304px rgba(0, 0, 0, 0.0243888);
+    }
-  z-index: 1;
-  position: relative;
 }
 
 .published-page {
-  .background-container {
+    .become-editor-link {
+        display: block;
+    }
+}
+
+// published page additions
+.published-page-header {
+    background-color: unset;
+    box-shadow: unset;
+    top: unset;
+    position: unset;
+    margin-top: 30px;
+
+    .published-page-header-wrapper {
+        justify-content: center;
+        background: var(--secondary);
+        max-width: 1000px;
+        border-radius: 1em 1em 0 0;
+        padding-top: 3em;
+
+        a {
             display: none;
         }
+
+        .published-page-title {
+            color: var(--primary);
+        }
+    }
+}
+
+.published-page-content-wrapper {
+    max-width: 1000px;
+    margin-top: 0;
+    margin-bottom: 50px;
+    background: var(--secondary);
+    border-radius: 0 0 1em 1em;
+    padding: 3em 3em 5%;
+
+    ul,
+    ol {
+        margin-left: 1.25em;
+    }
+}
+
+.published-page {
   &::before {
     background: linear-gradient(
       90deg,
@@ -533,24 +775,9 @@ html body #main-outlet {
 }
 
 .quote-button {
-  background-color: var(--primary-low-mid);
   border-radius: 0.5em;
 }
 
-.topic-list tr.selected td:nth-child(2),
-.topic-list-item.selected td:nth-child(2),
-.latest-topic-list-item.selected,
-.search-results .fps-result.selected {
-  box-shadow: inset 3px 0 0 var(--danger);
-}
-
-.topic-list tr.selected td:first-child,
-.topic-list-item.selected td:first-child,
-.latest-topic-list-item.selected,
-.search-results .fps-result.selected {
-  box-shadow: none;
-}
-
 .topic-list .main-link.focused + .posters {
   box-shadow: inset 3px 0 0 var(--tertiary);
 }
@@ -558,3 +785,83 @@ html body #main-outlet {
 .topic-list .main-link.focused {
   box-shadow: none;
 }
+
+.title-voting {
+  padding-left: 14px;
+}
+
+// Footer
+.orcashub-footer {
+    background-color: rgb(31 41 55);
+
+    .outer-container {
+        max-width: 80rem;
+        margin-left: auto;
+        margin-right: auto;
+        padding: 3rem 1.5rem;
+    }
+
+    .inner-container {
+        padding-bottom: 2rem;
+
+        @media (min-width: 1280) {
+            display: grid;
+            grid-template-columns: repeat(4, minmax(0, 1fr));
+            gap: 2rem;
+        }
+    }
+
+    .grid {
+        display: grid;
+        gap: 2rem;
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+
+        @media (min-width: 1280) {
+            grid-column: span 4/span 4;
+        }
+    }
+
+    .grid-row {
+        @media (min-width: 768px) {
+            display: grid;
+            grid-template-columns: repeat(2, minmax(0, 1fr));
+            gap: 2rem;
+        }
+    }
+
+    .second-group {
+        margin-top: 3rem;
+
+        @media (min-width: 768px) {
+            margin-top: 0;
+        }
+    }
+
+    h3 {
+        color: white;
+        font-size: 16px;
+        font-weight: 500;
+        line-height: 1.5rem;
+    }
+
+    ul {
+        margin: 0;
+        list-style: none;
+    }
+
+    li {
+        a {
+            color: rgb(209 213 219);
+            font-size: 16px;
+            line-height: 1.5rem;
+        }
+
+        a:hover {
+            color: white;
+        }
+
+        a:visited {
+            color: rgb(209 213 219) !important;
+        }
+    }
+}

common/footer.html

@@ -0,0 +1,52 @@
+<div class="become-editor-link">
+    <a href="https://orcas.community/editor">
+        Become an editor
+    </a>
+</div>
+
+<footer class="orcashub-footer">
+    <div class="outer-container">
+        <div class="inner-container">
+            <div class="grid">
+                <div class="grid-row">
+                    <div>
+                        <h3>Classifieds</h3>
+                        <ul>
+                            <li><a href="https://orcas.community/classified/for-sale">For Sale</a></li>
+                            <li><a href="https://orcas.community/classified/for-free">For Free</a></li>
+                            <li><a href="https://orcas.community/classified/want-to-buy">Looking For</a></li>
+                            <li><a href="https://orcas.community/classified/want-to-borrow">Want to Borrow</a></li>
+                            <li><a href="https://orcas.community/classified/new">New Post</a> </li>
+                        </ul>
+                    </div>
+                    <div class="second-group">
+                        <h3>Housing</h3>
+                        <ul>
+                            <li><a href="https://orcas.community/housing?filters=basic_for-rent">For Rent</a></li>
+                            <li><a href="https://orcas.community/housing?filters=basic_request">Requests</a> </li>
+                            <li><a href="https://orcas.community/housing/new">New Post</a> </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="grid-row">
+                    <div>
+                        <h3>Other Services</h3>
+                        <ul>
+                            <li><a href="/" target="_blank">Groups</a> </li>
+                            <li><a href="https://orcas.community/events">Events</a> </li>
+                            <li><a href="https://sanjuans.online/" target="_blank">San Juans Online</a></li>
+                        </ul>
+                    </div>
+                    <div class="second-group">
+                        <h3>About</h3>
+                        <ul>
+                            <li><a href="https://orcas.community/terms-of-service">Terms of Service</a></li>
+                            <li><a href="https://orcas.community/privacy-policy">Privacy Policy</a></li>
+                            <li><a href="https://opencollective.com/orcas-community" target="_blank">Donate</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</footer>

common/header.html

@@ -1 +1,5 @@
-<div class="background-container"></div>
+<div class="outer">
+    <a href="https://orcas.community/">
+        <div class="top-header-image"></div>
+	</a>
+</div>

desktop/desktop.scss

@@ -1,3 +1,47 @@
 @import "showcased-categories";
 @import "chat-desktop";
 @import "sidebar-desktop";
+
+.top-header-image {
+    height: 128px;
+    width: 246px;
+}
+
+// Header links
+.custom-header-links {
+    .headerLink a {
+        padding: .5rem .75rem;
+        margin: 0 .1rem;
+        color: var(--header_primary);
+        font-weight: 500;
+        font-size: .9rem;
+        line-height: 1.25rem;
+
+        &:hover {
+            color: white;
+        }
+    }
+
+    li:nth-last-child(2) {
+        a {
+            color: white;
+            background-color: #111827;
+            border-radius: .375rem;
+        }
+    }
+}
+
+// Sidebar
+
+.sidebar-section[data-section-name="orcashub"] {
+    // Hide OrcasHub section in the sidebar on desktop since it's show in the header.
+    display: none !important;
+}
+
+// Footer
+
+.custom-footer {
+    .list {
+        margin: 2rem 5em 4rem;
+    }
+}

eslint.config.mjs

@@ -0,0 +1,3 @@
+import DiscourseRecommendedTheme from "@discourse/lint-configs/eslint-theme";
+
+export default [...DiscourseRecommendedTheme];

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",
@@ -7,7 +7,7 @@ export default {
   initialize() {
     withPluginApi("0.8.14", (api) => {
       api.modifyClass("component:edit-category-general", {
-        pluginId: "discourse-air",
+        pluginId: "orcashub-discourse-theme",
 
         didInsertElement() {
           this._super(...arguments);

javascripts/discourse/initializers/init-topic-excerpts.js

@@ -1,8 +1,13 @@
 import { apiInitializer } from "discourse/lib/api";
+import { withSilencedDeprecations } from "discourse/lib/deprecated";
 
 export default apiInitializer("0.8", (api) => {
+  api.registerValueTransformer("topic-list-item-expand-pinned", () => true);
+
+  withSilencedDeprecations("discourse.hbr-topic-list-overrides", () => {
     api.modifyClass("component:topic-list-item", {
-    pluginId: "discourse-air",
+      pluginId: "orcashub-discourse-theme",
       expandPinned: true,
     });
   });
+});

locales/en.yml

@@ -1,3 +1,3 @@
 en:
   theme_metadata:
-    description: "Discourse Air Theme"
+    description: "A clean and modern theme for Discourse"

mobile/mobile.scss

@@ -1,9 +1,16 @@
 @import "chat-mobile";
 
+.top-header-image {
+    height: 80px;
+    width: 154px;
+    background-size: 154px 80px;
+}
+
 .custom-search-banner-wrap {
   h1 {
     font-size: 2.5em !important;
   }
+
   p {
     font-weight: normal;
     font-size: $font-up-1;
@@ -11,15 +18,45 @@
 }
 
 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,
+    .static-faq,
+    .static-privacy,
+    .about-page,
+    .static-faq,
+    .badges-page,
+    .tags-page,
+    .archetype-banner,
+    .archetype-regular,
+    .archetype-private_message,
+    .admin-interface,
+    .edit-category,
+    .user-summary-page,
+    .user-activity-page,
+    .user-invites-page,
+    .user-preferences-page,
+    .user-messages-page,
+    .user-notifications-page,
+    .user-badges-page
+  )
   #main-outlet {
   width: calc(100% - 1em);
-  padding: 0em 0.5em 1em 0.5em;
+  padding: 0 0.5em 1em 0.5em;
   box-shadow: none;
   background-color: transparent;
 }
 
+#main-outlet {
+  margin-inline: auto;
+}
+
+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,11 +70,14 @@ 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;
+  border-radius: 0;
   width: calc(100% - 3em);
   background-color: var(--secondary);
-  margin-bottom: 0px;
+  margin-bottom: 0;
 }
 
 .container.posts > .row {
@@ -46,7 +86,7 @@ html body.staff:not(.navigation-topics) #main-outlet {
 
 .navigation-categories .navigation-container,
 .categories-list .navigation-container {
-  border-bottom: 0px !important;
+  border-bottom: 0 !important;
 }
 
 body.category .category-breadcrumb .select-kit-header,
@@ -75,16 +115,18 @@ ol.category-breadcrumb {
     border-radius: 8px;
     border: none;
     background-color: var(--secondary);
+
     a:hover,
     a:focus {
       color: var(--primary);
       background-color: var(--secondary);
     }
   }
+
   .drop {
     top: calc(100% + 0.5em);
     border-radius: 8px;
-    box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.25);
+    box-shadow: 0 0 12px rgba(0, 0, 0, 0.25);
   }
 }
 
@@ -127,7 +169,7 @@ ol.category-breadcrumb {
   background: var(--secondary);
   padding: 1em;
   border-radius: 8px;
-  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 0 8px rgba(0, 0, 0, 0.05);
   border: 1px solid rgba(var(--primary-rgb), 0.1);
   margin-bottom: 0.5em;
 }
@@ -147,7 +189,7 @@ ol.category-breadcrumb {
 .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);
+  box-shadow: 0 0 8px rgba(0, 0, 0, 0.05);
   border: 1px solid rgba(var(--primary-rgb), 0.1);
   margin-bottom: 1em;
 }
@@ -156,14 +198,21 @@ ol.category-breadcrumb {
   flex-wrap: wrap;
 }
 
-.topic-list-item .discourse-tags {
+.topic-list-item {
+  > .topic-list-data {
+    width: 100%;
+  }
+
+  .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;
   }
@@ -184,19 +233,54 @@ ol.category-breadcrumb {
 }
 
 // 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;
   }
 }
+
+.list-controls .nav-pills .list-control-toggle-link-trigger {
+  color: var(--secondary);
+}
+
+// Footer
+.custom-footer {
+    .list {
+        margin: 2rem 0;
+    }
+}
+
+// Community Resources Category
+.category-resources {
+
+    // Topic List
+
+    .topic-list-data {
+        .right {
+            margin-left: 0 !important;
+            display: flex;
+            align-items: center;
+        }
+    }
+
+    // Topic Post
+
+    .topic-avatar,
+    .topic-meta-data {
+        display: none !important;
+    }
+}
+

package.json

@@ -1,10 +1,17 @@
 {
-  "name": "discourse-air",
+  "private": true,
-  "version": "1.0.0",
-  "repository": "https://github.com/discourse/discourse-air",
-  "author": "Jordan Vidrine",
-  "license": "GPL-2.0-or-later",
   "devDependencies": {
-    "eslint-config-discourse": "^3.2.0"
+    "@discourse/lint-configs": "2.11.1",
-  }
+    "ember-template-lint": "7.0.1",
+    "eslint": "9.22.0",
+    "prettier": "3.5.3",
+    "stylelint": "16.16.0"
+  },
+  "engines": {
+    "node": ">= 22",
+    "npm": "please-use-pnpm",
+    "yarn": "please-use-pnpm",
+    "pnpm": "9.x"
+  },
+  "packageManager": "pnpm@9.15.5"
 }

scss/chat-desktop.scss

@@ -2,6 +2,7 @@ html body.has-sidebar-page.has-full-page-chat {
   #main-outlet-wrapper {
     gap: 2em;
   }
+
   #main-outlet {
     padding-bottom: 0 !important;
   }
@@ -12,7 +13,7 @@ html body.has-sidebar-page.has-full-page-chat {
 }
 
 .chat-channel {
-  height: calc(100vh - (var(--header-offset) + 10em));
+  height: calc(100vh - (var(--header-offset) + 7.85em));
 }
 
 .c-navbar-container {
@@ -29,7 +30,8 @@ html body.has-sidebar-page.has-full-page-chat {
 
 .has-full-page-chat #main-outlet.wrap {
   margin-bottom: 30px;
-  padding-bottom: 0px !important;
+  padding-bottom: 0 !important;
+
   .full-page-chat {
     grid-template-rows: calc(var(--full-page-chat-height) - 50px);
   }
@@ -46,6 +48,7 @@ html body.has-sidebar-page.has-full-page-chat {
     border-radius: 0;
     margin: 0;
     padding: 0;
+
     .full-page-chat {
       grid-template-rows: var(--full-page-chat-height);
     }

scss/showcased-categories.scss

@@ -1,27 +1,5 @@
-.showcased-categories-sidebar .two-topic-list-sidebar {
-  .topic-excerpt {
-    display: none;
-  }
-
-  .btn-link.posts-map.badge-posts {
-    display: block;
-  }
-
-  .two-topic-list-sidebar .topic-list .topic-list-item {
-    height: unset;
-  }
-}
-
 .showcased-categories-sidebar {
-  .full-width .contents .topic-list {
-    display: unset;
-  }
-
   .two-topic-list-sidebar {
-    .topic-excerpt {
-      display: none;
-    }
-
     .btn-link.posts-map.badge-posts {
       display: block;
     }
@@ -29,5 +7,13 @@
     .topic-list .topic-list-item {
       height: unset;
     }
+
+    .topic-excerpt {
+      display: none;
+    }
+  }
+
+  .full-width .contents .topic-list {
+    display: unset;
   }
 }

scss/sidebar-desktop.scss

@@ -1,21 +1,18 @@
 // sidebar
-
+#main-outlet-wrapper {
-@mixin box-shadow($value: 0px) {
+  .sidebar-wrapper {
-  box-shadow: 0 24px 40px rgba(0, 0, 0, 0.07),
+    margin: 30px 0 50px;
+    background-color: var(--secondary);
+    border-radius: .5rem;
+    top: calc(var(--header-offset) + 30px);
+    height: calc(100vh - (var(--header-offset) + 80px));
+    box-shadow:
+      0 24px 40px rgba(0, 0, 0, 0.07),
       0 10.8529px 24.1177px rgba(0, 0, 0, 0.0456112),
       0 4.50776px 10.0172px rgba(0, 0, 0, 0.035),
       0 1.63037px 3.62304px rgba(0, 0, 0, 0.0243888);
   }
 
-#main-outlet-wrapper {
-  .sidebar-wrapper {
-    margin: 30px 0 50px;
-    background-color: var(--secondary);
-    border-radius: 1em;
-    top: calc(var(--header-offset) + 30px);
-    height: calc(100vh - (var(--header-offset) + 80px));
-    @include box-shadow;
-  }
   .sidebar-footer-wrapper {
     background: var(--secondary);
   }
@@ -25,6 +22,7 @@ body.has-sidebar-page {
   #main-outlet-wrapper {
     padding-left: 8px;
   }
+
   #main-outlet {
     max-width: unset;
   }

stylelint.config.mjs

@@ -0,0 +1,3 @@
+export default {
+  extends: ["@discourse/lint-configs/stylelint"],
+};