Skip to content

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

UX: Core foundation changes (#40847)

Jordan Vidrine36ee9d7cc826
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 c1e44cd1deb..023d936fd9e 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
@@ -43,7 +43,8 @@
.emoji-picker-trigger,
.topic-list-header-tab,
.reviewable-action-dropdown,
- .sidebar-section-header
+ .sidebar-section-header,
+ .tag-choice
) {
padding-block: 0;
height: var(--d-control-height);
@@ -66,6 +67,32 @@
}
}
+ .login-fullpage .input-group label.alt-placeholder,
+ .login-fullpage .input-group .user-field.text label.control-label,
+ .login-fullpage .input-group .user-field.dropdown label.control-label,
+ .login-fullpage .input-group .user-field.multiselect label.control-label,
+ .signup-fullpage .input-group label.alt-placeholder,
+ .signup-fullpage .input-group .user-field.text label.control-label,
+ .signup-fullpage .input-group .user-field.dropdown label.control-label,
+ .signup-fullpage .input-group .user-field.multiselect label.control-label,
+ .invites-show .input-group label.alt-placeholder,
+ .invites-show .input-group .user-field.text label.control-label,
+ .invites-show .input-group .user-field.dropdown label.control-label,
+ .invites-show .input-group .user-field.multiselect label.control-label,
+ .password-reset-page .input-group label.alt-placeholder,
+ .password-reset-page .input-group .user-field.text label.control-label,
+ .password-reset-page .input-group .user-field.dropdown label.control-label,
+ .password-reset-page
+ .input-group
+ .user-field.multiselect
+ label.control-label {
+ top: 8px;
+ }
+
+ .form-kit__control-password-wrapper {
+ height: unset;
+ }
+
.sidebar-section-header-dropdown-btn {
--d-button-default-border: none;
}
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/misc.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/misc.scss
index 7d0b0ca4916..8934cbd8aa4 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/misc.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/misc.scss
@@ -2,14 +2,4 @@
.discourse-reactions-counter .reactions-counter {
align-items: center;
}
-
- .user-primary-navigation .group-dropdown {
- max-width: 15ch;
-
- .name {
- display: inline-block;
-
- @include ellipsis;
- }
- }
}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index f38734edc2c..e1a4854f3e4 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -22,6 +22,13 @@
.group-dropdown {
margin-right: 0.5em;
+ max-width: 20ch;
+
+ .name {
+ display: inline-block;
+
+ @include ellipsis;
+ }
.mobile-view & {
.select-kit-header-wrapper {
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index 661ebad0f29..4a3e5f942d2 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -66,13 +66,15 @@
display: flex;
flex-wrap: wrap;
margin: -0.35em;
- margin-left: -0.25em;
position: relative;
+ align-items: center;
+ gap: var(--space-1);
.selected-choice {
- margin: 0.125em 0.25em 0.125em 0;
- padding: 0.2em 0.3em;
+ height: min-content;
+ padding: var(--space-1);
font-size: var(--font-down-1);
+ border-radius: var(--d-border-radius);
&.selected-choice-color {
border-bottom: 2px solid transparent;
diff --git a/frontend/discourse/select-kit/components/selected-choice.gjs b/frontend/discourse/select-kit/components/selected-choice.gjs
index f53b1d3aed6..3237fd7836f 100644
--- a/frontend/discourse/select-kit/components/selected-choice.gjs
+++ b/frontend/discourse/select-kit/components/selected-choice.gjs
@@ -49,7 +49,7 @@ export default class SelectedChoice extends Component {
<template>
{{#if this.readOnly}}
<button
- class="btn btn-default disabled"
+ class="btn btn-default disabled tag-choice"
title={{i18n "admin.site_settings.mandatory_group"}}
>{{this.itemName}}</button>
{{else}}
@@ -60,7 +60,7 @@ export default class SelectedChoice extends Component {
data-name={{this.itemName}}
type="button"
id="{{this.id}}-choice"
- class="btn btn-default selected-choice {{this.extraClass}}"
+ class="btn btn-default selected-choice tag-choice {{this.extraClass}}"
>
{{dIcon "xmark"}}
{{#if (has-block)}}
diff --git a/plugins/discourse-ai/assets/stylesheets/modules/ai-bot-conversations/common.scss b/plugins/discourse-ai/assets/stylesheets/modules/ai-bot-conversations/common.scss
index b77d0d2f443..941452a3872 100644
--- a/plugins/discourse-ai/assets/stylesheets/modules/ai-bot-conversations/common.scss
+++ b/plugins/discourse-ai/assets/stylesheets/modules/ai-bot-conversations/common.scss
@@ -167,6 +167,7 @@ body.has-ai-conversations-sidebar {
display: flex;
flex-direction: column;
min-width: 0;
+ gap: var(--space-2);
@include viewport.until(sm) {
.select-kit-header-wrapper {
@@ -177,8 +178,6 @@ body.has-ai-conversations-sidebar {
label {
font-size: var(--font-down-1);
font-weight: 300;
- margin-left: 1em;
- margin-bottom: 0;
}
.name {
@@ -237,7 +236,7 @@ body.has-ai-conversations-sidebar {
&__input-wrapper {
--input-min-height: 2.5em;
display: flex;
- align-items: end;
+ align-items: center;
width: 100%;
border: 1px solid var(--primary-low);
border-radius: var(--d-input-border-radius);
@@ -266,38 +265,6 @@ body.has-ai-conversations-sidebar {
border-color: var(--tertiary);
}
- .ai-conversation-submit {
- .d-icon {
- color: var(--primary-medium);
- padding: 0.5em;
- }
-
- &:hover,
- &:focus-visible {
- .d-icon {
- color: var(--primary-medium);
- }
- }
- }
-
- .ai-bot-upload-btn {
- min-height: var(--input-min-height);
- border: none;
-
- .d-icon {
- background: var(--primary-low);
- padding: 0.5em;
- border-radius: 100%;
- }
-
- &:hover,
- &:focus-visible {
- .d-icon {
- color: var(--primary);
- }
- }
- }
-
#ai-bot-conversations-input {
--scrollbarBg: transparent;
--scrollbarThumbBg: var(--primary-low);
@@ -309,7 +276,6 @@ body.has-ai-conversations-sidebar {
max-height: 30vh;
min-height: var(--input-min-height);
border: none;
- padding-block: 0.8em;
padding-inline: 0;
scrollbar-color: var(--scrollbarThumbBg) var(--scrollbarBg);
scrollbar-width: thin;
diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
index 81542569fd4..cb7927faba7 100644
--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
@@ -203,7 +203,7 @@ export default <template>
{{on "click" @controller.scrollTop}}
@route="adminPlugins.show.explorer.edit"
@model={{query.id}}
- class="btn btn-default btn-small"
+ class="btn btn-text btn-default btn-small"
>
{{i18n "edit"}}
</LinkTo>
diff --git a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
index 4a8e1bea17c..c11bc0028b7 100644
--- a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
+++ b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
@@ -953,12 +953,6 @@ table.group-reports {
background-color: inherit;
}
- tr a {
- color: inherit;
- cursor: pointer;
- display: inline-block;
- }
-
.no-search-results {
color: var(--primary-medium);
}