Skip to content

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

UX: style fixes for the reply-where modal (#41349)

Krisde76ef3f1832
diff --git a/app/assets/stylesheets/common/modal/modal-overrides.scss b/app/assets/stylesheets/common/modal/modal-overrides.scss
index 5085f1a05bc..a0bac82e9a3 100644
--- a/app/assets/stylesheets/common/modal/modal-overrides.scss
+++ b/app/assets/stylesheets/common/modal/modal-overrides.scss
@@ -616,28 +616,24 @@
max-width: 30em;
}
- .dialog-footer {
- display: block;
+ .btn-reply-where {
+ width: 100%;
+ margin-right: 0;
+
+ &:not(:last-of-type) {
+ margin-bottom: var(--space-3);
+ }
}
.btn {
display: block;
text-align: left;
- margin-bottom: 0.75em;
- margin-right: 0;
- overflow: hidden;
- width: 100%;
- border-radius: var(--d-border-radius);
+ border-radius: var(--d-button-border-radius);
&.dialog-close {
display: none;
}
- &.btn-reply-where__cancel {
- padding-left: 0;
- margin: 0;
- }
-
&.btn-reply-where {
min-height: 3em; // for situations when there are no categories/tags
}
@@ -675,22 +671,42 @@
}
}
- &.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-primary {
+ .badge-category__name,
+ .discourse-tag,
+ .discourse-tags__tag-separator {
+ --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 {
+ .badge-category__name,
+ .discourse-tag,
+ .discourse-tags__tag-separator {
+ --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);
+ &.btn-default:hover {
+ .badge-category__name,
+ .discourse-tag,
+ .discourse-tags__tag-separator {
+ --category-badge-title-color: var(--d-button-default-text-color--hover);
+ --tag-text-color: var(--d-button-default-text-color--hover);
+ }
+ }
+
+ .discourse-tags {
+ flex-wrap: nowrap;
+ overflow: hidden;
+ flex-shrink: 10000; // only shrink category if absolutely necessary
+
+ li {
+ flex-wrap: nowrap;
+ min-width: 0;
+ }
}
}
}
diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.js
index 335cec6f3c2..0cb182eeea2 100644
--- a/frontend/discourse/app/services/composer.js
+++ b/frontend/discourse/app/services/composer.js
@@ -1362,7 +1362,7 @@ export default class ComposerService extends Service {
buttons: [
{
label: i18n("composer.cancel"),
- class: "btn-flat btn-text btn-reply-where__cancel",
+ class: "btn-default btn-text btn-reply-where__cancel",
},
],
class: "reply-where-modal",