Skip to content

A platform for community discussion. Free, open, simple.

DEV: introduce additional CSS variables for theming (#38765)

Kris3c75a0a514b9
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 59c945b7bf8..c19306544a2 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -1,5 +1,10 @@
@use "lib/viewport";
+:root {
+ --category-boxes-min-width: 15em;
+ --category-boxes-max-width: 1fr;
+}
+
.category-list {
table-layout: fixed;
@@ -147,7 +152,10 @@
}
.category-boxes {
- grid-template-columns: repeat(auto-fit, minmax(15em, 1fr));
+ grid-template-columns: repeat(
+ auto-fit,
+ minmax(var(--category-boxes-min-width), var(--category-boxes-max-width))
+ );
.category-box {
> a {
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 202d492cfd8..16d94a23af2 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -64,6 +64,8 @@
--d-header-padding-x: 0.67em;
--d-table-border-top-height: 3px;
--d-wrap-padding-x: 0.67em;
+ --d-post-aside-background: var(--blend-primary-secondary-5);
+ --d-post-aside-border-left: 5px solid var(--primary-300);
--topic-title-font-weight: 400;
--topic-title-font-weight--visited: 400;
--topic-list-item-background-color: var(--secondary);
@@ -71,6 +73,7 @@
--list-container-padding-x: 0em;
--d-topic-list-header-font-size: initial;
--skip-links-offset: -75px;
+ --heading-font-weight: bold;
}
// Animation Keyframes
@@ -251,7 +254,8 @@ small {
}
blockquote {
- @include post-aside;
+ background: var(--d-post-aside-background);
+ border-left: var(--d-post-aside-border-left);
@include viewport.until(sm) {
clear: both;
@@ -275,6 +279,7 @@ h6 {
font-family: var(--heading-font-family);
margin-top: 0;
margin-bottom: 0.5rem;
+ font-weight: var(--heading-font-weight);
}
a.cancel {
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 3385a8d3ab4..a3560699241 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -1,5 +1,13 @@
@use "lib/viewport";
+:root {
+ --d-header-icon-color: var(--header_primary-low-mid);
+ --d-header-icon-color--hover: var(--header_primary);
+ --d-header-icon-color--active: var(--header_primary-medium);
+ --d-header-icon-background--hover: var(--d-hover);
+ --d-header-icon-background--active: var(--secondary);
+}
+
.d-header-wrap {
position: sticky;
top: 0;
@@ -179,7 +187,11 @@
.discourse-no-touch &:hover,
.discourse-no-touch &:focus-visible {
- background-color: var(--d-hover);
+ background-color: var(--d-header-icon-background--hover);
+
+ .d-icon {
+ color: var(--d-header-icon-color--hover);
+ }
}
}
@@ -187,11 +199,11 @@
.active .icon,
.header-color-scheme-toggle .-expanded {
position: relative;
- background-color: var(--secondary);
+ background-color: var(--d-header-icon-background--active);
cursor: default;
> .d-icon {
- color: var(--primary-medium);
+ color: var(--d-header-icon-color--active);
}
}
}
@@ -201,7 +213,7 @@
font-size: var(--font-up-4);
line-height: var(--line-height-large);
display: inline-block;
- color: var(--header_primary-low-mid);
+ color: var(--d-header-icon-color);
}
.notifications {
@@ -268,19 +280,21 @@
.d-icon {
font-size: var(--font-down-2);
width: 1em;
- color: var(--header_primary-high);
+ color: var(--d-header-icon-color);
}
.discourse-no-touch & {
&:hover {
+ color: var(--d-header-icon-color--hover);
border: 1px solid var(--header_primary-medium);
+ background: var(--d-header-icon-background--hover);
.language-switcher__locale {
color: var(--header_primary);
}
.d-icon {
- color: var(--header_primary-high);
+ color: var(--d-header-icon-color--hover);
}
}
}
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 0bd69c6e579..d8c7b0ec073 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -36,8 +36,8 @@ a.loading-onebox {
margin-top: 15px;
padding: 12px;
font-size: var(--font-0);
-
- @include post-aside;
+ background: var(--d-post-aside-background);
+ border-left: var(--d-post-aside-border);
.onebox-result-body {
padding-top: 5px;
@@ -387,7 +387,8 @@ aside.onebox .onebox-body .onebox-avatar {
blockquote {
aside.onebox {
- @include post-aside;
+ background: var(--d-post-aside-background);
+ border-left: var(--d-post-aside-border);
}
}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 6e37c0557bd..875fd81d4e5 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -799,8 +799,9 @@ aside.quote {
gap: var(--space-2);
color: var(--primary-high-or-secondary-low);
padding: 0.8em 0.8em 0 0.8em;
+ background: var(--d-post-aside-background);
+ border-left: var(--d-post-aside-border-left);
- @include post-aside;
@include unselectable;
&[data-can-toggle-quote] {
diff --git a/app/assets/stylesheets/common/components/empty-states.scss b/app/assets/stylesheets/common/components/empty-states.scss
index 8765c56fcf5..69c76ea9987 100644
--- a/app/assets/stylesheets/common/components/empty-states.scss
+++ b/app/assets/stylesheets/common/components/empty-states.scss
@@ -8,7 +8,8 @@
&.--text-only {
.empty-state__title {
- font-weight: bold;
+ font-family: var(--heading-font-family);
+ font-weight: var(--heading-font-weight);
font-size: var(--font-up-1);
}
}
diff --git a/app/assets/stylesheets/common/components/welcome-banner.scss b/app/assets/stylesheets/common/components/welcome-banner.scss
index 523d88654ee..c6aad4a90ee 100644
--- a/app/assets/stylesheets/common/components/welcome-banner.scss
+++ b/app/assets/stylesheets/common/components/welcome-banner.scss
@@ -1,6 +1,16 @@
@use "lib/viewport";
@import "common/foundation/mixins";
+:root {
+ --d-welcome-banner-text-alignment: center;
+ --d-welcome-banner-header-size: var(--font-up-6);
+ --d-welcome-banner-padding-top: var(--space-6);
+ --d-welcome-banner-padding-right: 0;
+ --d-welcome-banner-padding-bottom: var(--space-12);
+ --d-welcome-banner-padding-left: 0;
+ --d-welcome-banner-title-margin-bottom: var(--space-4);
+}
+
.display-welcome-banner {
#main-outlet {
padding-top: 0;
@@ -23,11 +33,14 @@
&__wrap {
box-sizing: border-box;
position: relative;
- padding: var(--space-6) 0 3em;
+ padding: var(--d-welcome-banner-padding-top)
+ var(--d-welcome-banner-padding-right)
+ var(--d-welcome-banner-padding-bottom);
.--with-bg-img & {
+ --d-welcome-banner-padding-right: var(--space-4);
+ --d-welcome-banner-padding-left: var(--space-4);
border-radius: var(--d-border-radius);
- padding-inline: var(--space-4);
background-size: cover;
background-position: center;
background-repeat: no-repeat;
@@ -35,13 +48,13 @@
}
@include viewport.until(md) {
- padding: var(--space-4) 8px var(--space-5);
+ --d-welcome-banner-padding-top: var(--space-4);
+ --d-welcome-banner-padding-right: 8px;
+ --d-welcome-banner-padding-bottom: var(--space-5);
margin-top: var(--space-2);
}
@include viewport.until(sm) {
- display: block;
- padding: var(--space-2);
margin-top: 0;
}
@@ -153,19 +166,28 @@
}
.search-menu-panel {
- // hacky but best guestimate we can do: full height of the viewport minus the header, minus the welcome banner spacing, minus font-size:6 title
- max-height: calc(100vh - var(--header-offset) - -3em - 4em);
+ // hacky but best guestimate we can do
+ // 4em is roughly the input height
+ --d-welcome-banner-height: calc(
+ var(--font-up-6) + var(--d-welcome-banner-padding-top) +
+ var(--d-welcome-banner-padding-bottom) +
+ var(--d-welcome-banner-title-margin-bottom) + 4em
+ );
+ max-height: calc(
+ 100vh - var(--header-offset) - var(--d-welcome-banner-height)
+ );
}
}
.welcome-banner__title {
font-size: var(--font-up-6);
- line-height: $line-height-medium;
- font-weight: bold;
- margin-bottom: var(--space-2);
+ line-height: var(--line-height-medium);
+ font-family: var(--heading-font-family);
+ font-weight: var(--heading-font-weight);
+ margin-bottom: var(--d-welcome-banner-title-margin-bottom);
+ text-align: var(--d-welcome-banner-text-alignment);
margin-inline: auto;
max-width: 70ch;
- text-align: center;
@include viewport.until(md) {
font-size: var(--font-up-4);
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 10528f855e6..d7dd5b29393 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -10,6 +10,7 @@
--d-nav-pill-border-radius: var(--d-border-radius);
--d-input-border-radius: var(--d-border-radius);
--d-content-background: initial;
+ --d-link-text-decoration: none;
// used for padding & margin
--space: 0.25rem; // 4px
@@ -63,7 +64,7 @@ a:visited,
a:hover,
a:active {
color: var(--d-link-color);
- text-decoration: none;
+ text-decoration: var(--d-link-text-decoration);
cursor: pointer;
}
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index e20e979a68d..a6ef003885d 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -137,11 +137,6 @@ $hpad: 0.65em;
}
// Stuff we repeat
-@mixin post-aside {
- border-left: 5px solid var(--primary-300);
- background-color: var(--blend-primary-secondary-5);
-}
-
@mixin d-animation($name, $duration, $easing: ease) {
animation: $name $duration $easing forwards;
diff --git a/plugins/chat/assets/stylesheets/common/chat-transcript.scss b/plugins/chat/assets/stylesheets/common/chat-transcript.scss
index b53eeaef7aa..50ac87b11ae 100644
--- a/plugins/chat/assets/stylesheets/common/chat-transcript.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-transcript.scss
@@ -4,8 +4,8 @@
min-height: 50px;
padding: 12px;
margin: 1rem 0;
-
- @include post-aside;
+ background: var(--d-post-aside-background);
+ border-left: var(--d-post-aside-border-left);
.chat-messages-container & {
display: block;