Skip to content

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

UX: Remove new height variables from foundation modernization (#41440)

Jordan Vidrine70fc4af44fcd
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 bf058c4ddd7..51607cfcd3d 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
@@ -10,129 +10,10 @@
--d-button-default-text-color: var(--primary-900);
--d-button-default-icon-color: var(--primary-900);
- .btn-default,
- .btn-icon-text,
- .btn-icon,
- .btn-danger,
- .btn-primary,
- .btn.no-text,
- .view-all-drafts,
- .discourse-reactions-counter .reactions-counter,
- #topic-progress-wrapper {
- &:not(
- .topic-voting-menu-trigger,
- .sidebar-footer-actions-button,
- #search-button,
- .btn-sidebar-toggle,
- .topic-map__views-trigger,
- .topic-map__likes-trigger,
- .topic-map__users-trigger,
- .topic-map__links-trigger,
- .user,
- .notifications-tracking-btn,
- .user-menu-tab,
- .--with-description,
- .chat-message-react-btn,
- .profile-tab-btn,
- .back-button,
- .composer-actions-btn,
- .language-switcher-trigger,
- .d-multi-select-trigger__expand-btn,
- .emoji-picker-trigger,
- .topic-list-header-tab,
- .reviewable-action-dropdown,
- .sidebar-section-header,
- .chat-message-creator__member,
- .tag-choice
- ) {
- padding-block: 0;
- height: var(--d-control-height);
- padding-inline: var(--space-2);
- }
- }
-
- .btn.no-text.btn-icon {
- &:not(
- .topic-voting-menu-trigger,
- .voting-wrapper__button,
- .user-menu-tab,
- .user-menu-tab-active,
- .composer-actions-btn,
- .dropdown-select-box-header,
- .d-multi-select-trigger__expand-btn,
- .emoji-picker-trigger
- ) {
- width: var(--d-control-height);
- }
- }
-
- .form-kit__control-password-wrapper {
- height: unset;
- }
-
.sidebar-section-header-dropdown-btn {
--d-button-default-border: none;
}
- .c-footer button {
- padding-block: 0.75rem !important;
- height: unset !important;
- }
-
- .topic-replies-toggle-wrapper .topics-replies-toggle {
- border-radius: var(--d-border-radius);
- height: var(--d-control-height);
- padding: 0 0.65em;
- }
-
- .topic-replies-toggle-wrapper .topics-replies-toggle.active:hover {
- background-color: var(--d-nav-bg-color--active);
- color: var(--d-nav-color--active);
- }
-
- .bookmark-menu-content .bookmark-menu__title,
- .bookmark-menu-content .bookmark-menu__row-title {
- padding-block: 0;
- padding-inline: var(--d-sidebar-row-horizontal-padding);
- height: var(--d-sidebar-row-height);
- }
-
- .bookmark-menu-content .bookmark-menu__row-title {
- display: flex;
- align-items: center;
- }
-
- .search-container .search-bar input.search-query {
- height: var(--d-control-height);
- }
-
- .search-input,
- input[type="text"],
- input[type="password"],
- input[type="datetime"],
- input[type="datetime-local"],
- input[type="date"],
- input[type="month"],
- input[type="time"],
- input[type="week"],
- input[type="number"],
- input[type="email"],
- input[type="url"],
- input[type="search"],
- input[type="tel"],
- input[type="color"] {
- height: var(--d-control-height);
- padding-block: 0;
- }
-
- .search-input {
- .search-context {
- height: calc(
- var(--d-control-height) - var(--space-2)
- ) !important; // overrides very specific btn selector at the top of this file
- }
- }
-
// button on /my/badges
.favorite-btn {
border-color: var(--primary-low);
@@ -144,68 +25,4 @@
border-right: none;
}
}
-
- .login-fullpage,
- .signup-fullpage,
- .invites-show,
- .password-reset-page {
- .input-group {
- label.alt-placeholder,
- .user-field.text label.control-label {
- top: 8px;
- }
-
- .user-field.dropdown label.control-label,
- .user-field.multiselect label.control-label,
- .user-field.date label.control-label {
- top: -8px;
- }
- }
- }
-
- .invite-page,
- .signup-fullpage {
- .user-fields .input-group {
- .user-field.text,
- .user-field.textarea {
- &:not(.value-entered, :focus-within)
- label.alt-placeholder.control-label {
- top: 8px;
- }
- }
- }
- }
-
- @include viewport.until(md) {
- .login-form,
- #login-form,
- .invite-form {
- .input-group {
- input {
- height: var(--d-control-height);
- }
-
- label.alt-placeholder,
- .user-field.text label.control-label,
- .user-field.textarea label.control-label {
- top: 7px;
- }
-
- input:focus + label,
- input.value-entered + label.alt-placeholder,
- div.user-field:not(.dropdown)
- .controls
- input:focus
- + label.alt-placeholder.control-label,
- div.user-field.value-entered:not(.dropdown)
- .controls
- label.alt-placeholder.control-label,
- .user-field.dropdown label.control-label,
- .user-field.multiselect label.control-label,
- .user-field.date label.control-label {
- top: -9px;
- }
- }
- }
- }
}
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 654af585159..5912dd8651a 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
@@ -5,10 +5,6 @@
height: 3.25em;
}
- .d-header {
- --d-control-height: var(--space-8);
- }
-
.d-header .title {
@include viewport.from(sm) {
--d-logo-height: 2.3em;
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/select-kit.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/select-kit.scss
index 9e3472fa9a0..84f10a8e96a 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/select-kit.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/select-kit.scss
@@ -1,25 +1,13 @@
.uc-modernize-foundation-theme {
- .select-kit .select-kit-header:not(.composer-actions-btn),
- .d-date-input .date-picker {
- height: var(--d-control-height);
- }
-
.select-kit.is-expanded .select-kit-filter.is-expanded {
border: none;
}
- .select-kit.is-expanded .select-kit-filter.is-expanded {
- height: var(--d-control-height);
- padding-block: 0;
- }
-
.select-kit .caret-icon {
font-size: var(--font-down-1);
}
.list-controls .combo-box .combo-box-header {
- height: var(--d-control-height);
-
&:hover {
background-color: var(--primary-100);
}
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss
index f1c39779461..acc7c9ef5a0 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss
@@ -1,7 +1,6 @@
.uc-modernize-foundation-theme {
// New Variables
--webkit-font-smoothing: antialiased;
- --d-control-height: var(--space-9);
--welcome-banner-text-align: center;
--welcome-banner-search-menu-margin-inline: auto;
-webkit-font-smoothing: var(--webkit-font-smoothing);
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/welcome-banner.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/welcome-banner.scss
index 2b55b22f3a0..c5c68a20af2 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/welcome-banner.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/welcome-banner.scss
@@ -3,6 +3,7 @@
&__wrap .search-menu {
align-items: center;
+ margin-inline: var(--welcome-banner-search-menu-margin-inline);
}
&__subheader {
@@ -14,8 +15,4 @@
font-weight: 500;
text-align: var(--welcome-banner-text-align);
}
-
- &__wrap .search-menu {
- margin-inline: var(--welcome-banner-search-menu-margin-inline);
- }
}