Skip to content

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

UX: Implement foundation fixes & feedback (#40494)

Jordan Vidrine34bd1916347f
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 55995879be2..be7ea17cfa3 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -326,7 +326,7 @@
padding-right: var(--space-1);
}
- .num {
+ .topic-list-data.num {
text-align: center;
font-size: var(--d-topic-list-data-font-size);
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index 7bc10ee2aa9..ee1cd13317b 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -609,7 +609,7 @@ div.edit-category {
}
.cell,
- .btn-flat {
+ .options.actionable .btn.btn-flat {
width: 33%;
padding: 0.5em;
}
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss
index 155b115de76..d0775a7f86c 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss
@@ -1,5 +1,5 @@
.uc-modernize-foundation-theme {
- --d-button-default-bg-color: transparent;
+ --d-button-default-bg-color: var(--secondary);
--d-button-default-border: 1px solid var(--primary-200);
--d-button-default-border--hover: 1px solid var(--primary-300);
--d-button-default-bg-color--hover: var(--primary-200);
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/header.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/header.scss
index c3113664181..efece483ff0 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/header.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/header.scss
@@ -16,7 +16,9 @@
}
.extra-info-wrapper .title-wrapper {
- font-size: var(--font-down-1);
+ @include viewport.from(sm) {
+ font-size: var(--font-down-1);
+ }
}
.header-sidebar-toggle button,
diff --git a/app/assets/stylesheets/common/modal/modal-overrides.scss b/app/assets/stylesheets/common/modal/modal-overrides.scss
index 7c4eea16ca2..115a0af7667 100644
--- a/app/assets/stylesheets/common/modal/modal-overrides.scss
+++ b/app/assets/stylesheets/common/modal/modal-overrides.scss
@@ -635,25 +635,11 @@
display: none;
}
- &.btn-reply-on-original {
- --text-color: var(--secondary);
- }
-
&.btn-reply-where__cancel {
padding-left: 0;
margin: 0;
}
- &.btn-reply-here {
- --text-color: var(--primary);
-
- .discourse-no-touch & {
- &:hover {
- --text-color: var(--secondary);
- }
- }
- }
-
&.btn-reply-where {
min-height: 3em; // for situations when there are no categories/tags
}
@@ -668,11 +654,9 @@
.topic-title__top-line {
display: flex;
align-items: baseline;
- color: var(--text-color);
font-size: var(--font-up-1);
.d-icon {
- color: var(--text-color);
margin: 0;
}
}
@@ -691,11 +675,24 @@
.discourse-tags {
font-size: var(--font-down-1);
}
+ }
- .badge-category__name,
- .discourse-tag {
- color: var(--text-color);
- }
+ &.btn-primary .badge-category__name,
+ &.btn-primary .discourse-tag {
+ --category-badge-title-color: var(--d-button-primary-text-color);
+ --tag-text-color: var(--d-button-primary-text-color);
+ }
+
+ &.btn-default .badge-category__name,
+ &.btn-default .discourse-tag {
+ --category-badge-title-color: var(--d-button-default-text-color);
+ --tag-text-color: var(--d-button-default-text-color);
+ }
+
+ &.btn-default:hover .badge-category__name,
+ &.btn-default:hover .discourse-tag {
+ --category-badge-title-color: var(--d-button-default-text-color--hover);
+ --tag-text-color: var(--d-button-default-text-color--hover);
}
}
}
diff --git a/app/assets/stylesheets/wcag.scss b/app/assets/stylesheets/wcag.scss
index b79b764dcc5..66828fb4f6f 100644
--- a/app/assets/stylesheets/wcag.scss
+++ b/app/assets/stylesheets/wcag.scss
@@ -333,22 +333,17 @@ html.discourse-no-touch .uc-modernize-foundation-theme {
&.btn-hover,
&:focus {
.d-icon {
- color: var(--d-button-default-icon-color--hover);
+ color: var(--d-button-default-icon-color);
}
}
}
- // Create topic button - ensure icon matches text color
- #create-topic .d-icon {
- color: var(--d-button-default-icon-color);
- }
-
// Composer button bar icons should match the modernize theme
.d-editor-button-bar .btn-icon.btn-default .d-icon {
color: var(--d-button-default-icon-color);
&:hover {
- color: var(--d-button-default-icon-color--hover);
+ color: var(--d-button-default-icon-color);
}
}
}
diff --git a/frontend/discourse/app/components/topic-reply-choice-dialog.gjs b/frontend/discourse/app/components/topic-reply-choice-dialog.gjs
index 2f6f6cf6c0b..a2a51abb268 100644
--- a/frontend/discourse/app/components/topic-reply-choice-dialog.gjs
+++ b/frontend/discourse/app/components/topic-reply-choice-dialog.gjs
@@ -70,7 +70,7 @@ export default class TopicReplyChoiceDialog extends Component {
<TopicLabelButton
@action={{this.replyOnCurrent}}
@topic={{@model.currentTopic}}
- class="btn-reply-where btn-reply-here"
+ class="btn-reply-where btn-reply-here btn-default"
/>
</template>
}