update plugin

.discourse-compatibility

@@ -1 +1,8 @@
-2.6.0.beta3: 79d57c32d579d85590ef50344edf236cad52f9de
+< 3.5.0.beta1-dev: 3402e1c8182fa2d5fed33c8bf4eaea131af4124e
+< 3.4.0.beta1-dev: 9e7c22402b8af821e44d1213bebb4e6e75245e1d
+< 3.3.0.beta2-dev: e64cfa531121f2cf152901f5b2a20512a5ee2c63
+< 3.3.0.beta1-dev: 35b0c2da37318f502bb7069ee8e3565eb3ba5dbf
+3.1.999: e2cc21b33261ffeb32030e8ab5ea92775c911fbc
+< 3.2.0.beta1-dev: b36e2a5199db23e5f05374640b9690573a08b352
+< 3.2.0.beta2: 12e6f76e0508b262517efd5db2d7feca261dff86
+2.6.0.beta3: 79d57c32d579d85590ef50344edf236cad52f9de

.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

.gitignore

@@ -0,0 +1,2 @@
+node_modules
+.discourse-site

.npmrc

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

.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");

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,87 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.2.1.1)
+      base64
+      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)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    drb (2.2.1)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.1)
+    minitest (5.25.1)
+    parallel (1.26.3)
+    parser (3.3.5.0)
+      ast (~> 2.4.1)
+      racc
+    prettier_print (1.2.1)
+    racc (1.8.1)
+    rack (3.1.10)
+    rainbow (3.1.1)
+    regexp_parser (2.9.2)
+    rubocop (1.67.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
+      rubocop (~> 1.41)
+    rubocop-discourse (3.8.2)
+      activesupport (>= 6.1)
+      rubocop (>= 1.59.0)
+      rubocop-capybara (>= 2.0.0)
+      rubocop-factory_bot (>= 2.0.0)
+      rubocop-rails (>= 2.25.0)
+      rubocop-rspec (>= 3.0.1)
+      rubocop-rspec_rails (>= 2.30.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-rails (2.26.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.52.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.1.0)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
+    syntax_tree (6.2.0)
+      prettier_print (>= 1.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.6.0)
+
+PLATFORMS
+  arm64-darwin-23
+  ruby
+
+DEPENDENCIES
+  rubocop-discourse
+  syntax_tree
+
+BUNDLED WITH
+   2.5.21

README.md

@@ -1,3 +1,3 @@
-## Brand header theme component for Discourse
-
-More info at: https://meta.discourse.org/t/brand-header-theme-component/77977
+# Brand header theme component for Discourse
+
+More info at: https://meta.discourse.org/t/brand-header-theme-component/77977

about.json

@@ -1,6 +1,6 @@
-{
-  "name": "Brand Header Theme Component",
-  "about_url": "https://meta.discourse.org/t/brand-header-theme-component/77977",
-  "license_url": "https://github.com/discourse/discourse-brand-header/blob/master/LICENSE.txt",
-  "component": true
-}
+{
+  "name": "Brand Header",
+  "component": true,
+  "about_url": "https://meta.discourse.org/t/brand-header-theme-component/77977",
+  "license_url": "https://github.com/discourse/discourse-brand-header/blob/main/LICENSE.txt"
+}

common/common.scss

@@ -1,81 +1,102 @@
-@import "theme_variables";
-
-.b-header {
-
-  .contents {
-    margin: 8px 0;
-  }
-
-  #brand-logo {
-    max-height: 32px;
-  }
-
-  #brand-text-logo {
-    line-height: 32px;
-    margin: 0;
-  }
-
-  nav.links {
-    float: left;
-    .rtl & {
-      float: right;
-    }
-  }
-
-  .nav-pills {
-    margin-bottom: 0;
-    > li > a {
-      color: $secondary;
-      line-height: 22px;
-      &:hover {
-        color: $quaternary;
-        background-color: dark-light-diff($quaternary, $tertiary, -70%, 70%);
-      }
-      &.active > a, > a.active {
-        color: $secondary;
-        background-color: $quaternary;
-      }
-    }
-  }
-
-  .panel {
-    float: right;
-    position: relative;
-    .rtl & {
-      float: left;
-    }
-  }
-
-  ul.icons {
-    text-align: center;
-    margin: 0 0 0 5px;
-    > li {
-      float: left;
-      list-style: none;
-    }
-    a, [class^="fa fa-"] {
-      width: 28px;
-      height: 28px;
-      font-size: 16px;
-      line-height: 28px;
-      display: inline-block;
-      margin: 2px;
-    }
-    .rtl & {
-        margin: 0 5px 0 0;
-      > li {
-        float: right;
-      }
-    }
-  }
-
-  .panel > ul.icons {
-    float: right;
-    a, [class^="fa fa-"] {
-      color: $secondary;
-    }
-    .rtl & {
-      float: left;
-    }
-  }
-}
+.b-header,
+.brand-header-contents {
+  #brand-logo {
+    max-height: 32px;
+  }
+  h2 {
+    margin: 0;
+  }
+}
+
+.b-header {
+  width: 100%;
+  background-color: var(--tertiary);
+  margin-bottom: 0;
+
+  .title {
+    float: left;
+    margin-right: 24px;
+    .rtl & {
+      margin-left: 24px;
+      margin-right: 0;
+    }
+
+    a {
+      color: var(--secondary);
+      &:visited {
+        color: var(--secondary);
+      }
+    }
+  }
+
+  .wrap {
+    box-sizing: border-box;
+  }
+
+  .contents {
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 8px 0;
+  }
+
+  #brand-text-logo {
+    margin: 0;
+  }
+
+  nav.links {
+    min-width: 0;
+    overflow: hidden;
+  }
+
+  .nav-pills {
+    margin: 0;
+
+    > li > a {
+      min-width: 0;
+      color: var(--secondary);
+      @include ellipsis;
+      &:hover {
+        color: var(--quaternary);
+        background-color: var(--quaternary-low);
+      }
+      &.active > a,
+      > a.active {
+        color: var(--secondary);
+        background-color: var(--quaternary);
+      }
+    }
+  }
+
+  .panel {
+    margin: 0 0 0 auto;
+    .rtl & {
+      margin: 0 auto 0 0;
+    }
+  }
+
+  ul.icons {
+    display: flex;
+    text-align: center;
+    margin: 0 0 0 5px;
+    list-style: none;
+
+    li {
+      margin-left: 0.25em;
+    }
+
+    a {
+      width: 28px;
+      height: 28px;
+      font-size: var(--font-up-1);
+      margin: 2px;
+    }
+  }
+
+  .panel > ul.icons {
+    a,
+    .d-icon {
+      color: var(--secondary);
+    }
+  }
+}