Fix padding on become and editor button

about.json

@@ -1,36 +1,30 @@
 {
-  "name": "Air Theme",
+  "name": "OrcasHub Theme",
   "about_url": null,
   "license_url": null,
   "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",
-      "highlight": "e6cb37",
-      "danger": "d05454",
-      "success": "71bd9f",
-      "love": "c16ad7"
-    },
-    "air-dark": {
-      "primary": "e0e0e0",
-      "secondary": "2d2d2d",
-      "tertiary": "9a5cfd",
-      "quaternary": "71bd9f",
-      "header_background": "202020",
       "header_primary": "e0e0e0",
-      "highlight": "9a5cfd",
+      "highlight": "e6cb37",
       "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/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;
+    }
+}

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

@@ -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

@@ -2,7 +2,7 @@ import { apiInitializer } from "discourse/lib/api";
 
 export default apiInitializer("0.8", (api) => {
   api.modifyClass("component:topic-list-item", {
-    pluginId: "discourse-air",
+    pluginId: "orcashub-discourse-theme",
     expandPinned: true,
   });
 });

mobile/mobile.scss

@@ -1,5 +1,11 @@
 @import "chat-mobile";
 
+.top-header-image {
+    height: 80px;
+    width: 154px;
+    background-size: 154px 80px;
+}
+
 .custom-search-banner-wrap {
   h1 {
     font-size: 2.5em !important;
@@ -200,3 +206,32 @@ ol.category-breadcrumb {
     padding-right: 0.25em;
   }
 }
+
+// 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,7 +1,7 @@
 {
-  "name": "discourse-air",
+  "name": "orcashub-discourse-theme",
   "version": "1.0.0",
-  "repository": "https://github.com/discourse/discourse-air",
+  "repository": "https://git.grosinger.net/tgrosinger/orcashub-discourse-theme",
   "author": "Jordan Vidrine",
   "license": "GPL-2.0-or-later",
   "devDependencies": {

scss/sidebar-desktop.scss

@@ -1,17 +1,17 @@
 // sidebar
 
 @mixin box-shadow($value: 0px) {
-  box-shadow: 0 24px 40px rgba(0, 0, 0, 0.07),
+  box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px,
-    0 10.8529px 24.1177px rgba(0, 0, 0, 0.0456112),
+    rgba(0, 0, 0, 0) 0px 0px 0px 0px,
-    0 4.50776px 10.0172px rgba(0, 0, 0, 0.035),
+    rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
-    0 1.63037px 3.62304px rgba(0, 0, 0, 0.0243888);
+    rgba(0, 0, 0, 0.1) 0px 1px 2px -1px;
 }
 
 #main-outlet-wrapper {
   .sidebar-wrapper {
     margin: 30px 0 50px;
     background-color: var(--secondary);
-    border-radius: 1em;
+    border-radius: .5rem;
     top: calc(var(--header-offset) + 30px);
     height: calc(100vh - (var(--header-offset) + 80px));
     @include box-shadow;