Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
rschlaefli committed May 20, 2024
2 parents 7b10713 + d45f543 commit 622b9f3
Show file tree
Hide file tree
Showing 19 changed files with 2,297 additions and 6,715 deletions.
2 changes: 2 additions & 0 deletions .discourse-compatibility
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
< 3.3.0.beta1-dev: c23bcfa51b63de3f43a08e9013e35e1246aade71

8 changes: 0 additions & 8 deletions .eslintrc

This file was deleted.

1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/eslint-theme");
48 changes: 0 additions & 48 deletions .github/workflows/component-linting.yml

This file was deleted.

147 changes: 0 additions & 147 deletions .github/workflows/component-tests.yml

This file was deleted.

11 changes: 11 additions & 0 deletions .github/workflows/discourse-theme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Discourse Theme

on:
push:
branches:
- main
pull_request:

jobs:
ci:
uses: discourse/.github/.github/workflows/discourse-theme.yml@v1
1 change: 0 additions & 1 deletion .prettierrc

This file was deleted.

1 change: 1 addition & 0 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/prettier");
1 change: 1 addition & 0 deletions .template-lintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/template-lint");
4 changes: 0 additions & 4 deletions .template-lintrc.js

This file was deleted.

8 changes: 6 additions & 2 deletions about.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,19 @@
"secondary": "F6FBFC",
"tertiary": "4F8A7C",
"header_background": "ffffff",
"header_primary": "111111"
"header_primary": "111111",
"selected": "e3efec",
"hover": "e3efec"
},
"mint-dark": {
"primary": "e0e0e0",
"secondary": "2d2d2d",
"tertiary": "4F8A7C",
"header_background": "202020",
"header_primary": "e0e0e0",
"highlight": "b2b235"
"highlight": "b2b235",
"selected": "1c302b",
"hover": "1c302b"
}
},
"components": [
Expand Down
47 changes: 21 additions & 26 deletions common/common.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "variables";
@import "sidebar";
@import "chat";

:root {
--tertiary: #dc6027;
Expand All @@ -24,28 +25,8 @@ input[type="color"],
border-radius: var(--mint-border-radius);
}

input[type="text"]:focus,
input[type="password"]:focus,
input[type="datetime"]:focus,
input[type="datetime-local"]:focus,
input[type="date"]:focus,
input[type="month"]:focus,
input[type="time"]:focus,
input[type="week"]:focus,
input[type="number"]:focus,
input[type="email"]:focus,
input[type="url"]:focus,
input[type="search"]:focus,
input[type="tel"]:focus,
input[type="color"]:focus,
.d-editor-textarea-wrapper.in-focus,
.select-kit.multi-select.is-expanded .multi-select-header,
.select-kit.single-select.is-expanded .select-kit-header:not(.btn),
.select-kit.single-select .select-kit-header:not(.btn):focus,
.select-kit.single-select .select-kit-header:not(.btn):active {
border-radius: var(--mint-border-radius);
box-shadow: none;
outline: none;
:root {
--d-input-border-radius: var(--mint-border-radius);
}

.d-header {
Expand All @@ -60,12 +41,13 @@ input[type="color"]:focus,

.custom-homepage-columns {
margin: 2em 0 2em 0;
padding: 0;
.col {
position: relative;
border-radius: var(--mint-border-radius);
@include mint-card-bg;
padding: 2em 2em 1em;
border-top: 8px solid $tertiary;
border-top: 8px solid var(--tertiary);
box-shadow: 0 8px 60px 0 rgba(103, 151, 255, 0.1),
0 12px 90px 0 rgba(133, 255, 103, 0.1);
.header-wrapper {
Expand All @@ -90,6 +72,10 @@ input[type="color"]:focus,
}
}
}

.loading-container:not(:has(.spinner)) {
min-height: unset;
}
}

.navigation-categories .search-banner {
Expand All @@ -111,7 +97,7 @@ input[type="color"]:focus,
0 12px 90px 0 rgba(133, 255, 103, 0.1);
padding: 2em;
@include mint-card-bg;
border-top: 8px solid $tertiary;
border-top: 8px solid var(--tertiary);
margin-top: 0.8em;
}
}
Expand Down Expand Up @@ -296,8 +282,8 @@ a {
color: var(--tertiary-hover);
}

.discourse-no-touch .btn:hover,
.discourse-no-touch .btn.btn-hover {
.discourse-no-touch .btn:not(.btn-flat):hover,
.discourse-no-touch .btn:not(.btn-flat).btn-hover {
color: var(--secondary);
background: var(--tertiary-hover);
border-radius: 5px;
Expand Down Expand Up @@ -375,6 +361,15 @@ a:hover {
}
}

.custom-search-banner-wrap {
border-radius: var(--mint-border-radius);
background: linear-gradient(
270deg,
var(--tertiary-medium) 0%,
var(--tertiary) 100%
);
}

.custom-search-banner-wrap h1,
.custom-search-banner-wrap p {
color: var(--tertiary);
Expand Down
2 changes: 1 addition & 1 deletion desktop/desktop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:not(.navigation-categories):not(.navigation-topics) #main-outlet {
padding: 2em;
@include mint-card-bg;
border-top: 8px solid $tertiary;
margin-top: 0.8em;
margin-top: 1em;
}

.boxed {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

{{#if showcasedCategoriesInstalled}}
<TwoTopicList />
{{/if}}
{{/if}}
Loading

0 comments on commit 622b9f3

Please sign in to comment.