A platform for community discussion. Free, open, simple.
UI: Pull dropdown menu item changes into foundation (#38512)
Jordan Vidrine68ab29fce5dd
diff --git a/app/assets/stylesheets/common/base/sidebar-section-link.scss b/app/assets/stylesheets/common/base/sidebar-section-link.scssindex d88e57ec57d..3363802d5d3 100644--- a/app/assets/stylesheets/common/base/sidebar-section-link.scss+++ b/app/assets/stylesheets/common/base/sidebar-section-link.scss@@ -157,7 +157,9 @@&.dropdown-menu__item .sidebar-section-link,.dropdown-menu__item .sidebar-section-link {- border-radius: 0;+ height: var(--d-sidebar-row-height);+ padding-inline: var(--d-sidebar-row-horizontal-padding);+ border-radius: var(--d-border-radius);}.--link-button {diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme.scssindex 843584f905a..cffc613dbbd 100644--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme.scss+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme.scss@@ -135,24 +135,6 @@color: var(--d-nav-color--active);}- // dropdown menu- .dropdown-menu__item .btn,- .dropdown-menu__item .sidebar-section-link {- &:not(.notifications-tracking-btn, .--with-description) {- height: var(--d-sidebar-row-height) !important;- padding-inline: var(--d-sidebar-row-horizontal-padding);- }- }-- .sidebar-section-link-wrapper.dropdown-menu__item .sidebar-section-link,- .sidebar-section-link-wrapper .dropdown-menu__item .sidebar-section-link {- border-radius: var(--d-border-radius);- }-- .dropdown-menu__item {- border-radius: var(--d-border-radius);- }-.bookmark-menu-content .bookmark-menu__title,.bookmark-menu-content .bookmark-menu__row-title {padding-block: 0;@@ -169,29 +151,10 @@margin-right: 0;}- .dropdown-menu {- display: flex;- flex-direction: column;- gap: var(--d-sidebar-vertical-gap);- padding: var(--space-1);- }-.sidebar-section-link-wrapper .sidebar-section-link-prefix .prefix-square {border-radius: calc(var(--d-border-radius) / 2);}- .dropdown-menu__item .btn {- display: inline-flex;- gap: var(--d-sidebar-section-link-prefix-margin-right);- padding-inline: var(--d-sidebar-row-horizontal-padding);- border-radius: var(--d-border-radius);- }-- .dropdown-menu__item .btn .svg-icon {- width: var(--d-sidebar-section-link-prefix-width);- margin-right: 0;- }-.sidebar-more-section-content .sidebar-row {padding-block: 0;}diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scssindex b7e3b0a2702..202c3990af7 100644--- a/app/assets/stylesheets/common/components/_index.scss+++ b/app/assets/stylesheets/common/components/_index.scss@@ -73,7 +73,6 @@@import "emoji-picker";@import "filter-input";@import "filter-navigation";-@import "dropdown-menu";@import "welcome-banner";@import "d-multi-select";@import "d-otp";diff --git a/app/assets/stylesheets/common/components/dropdown-menu.scss b/app/assets/stylesheets/common/components/dropdown-menu.scssdeleted file mode 100644index 7fda5ce9768..00000000000--- a/app/assets/stylesheets/common/components/dropdown-menu.scss+++ /dev/null@@ -1,41 +0,0 @@-.dropdown-menu {- padding: 0;- margin: 0;-- &__item {- list-style: none;-- .btn {- padding: 0.65rem 1rem;- width: 100%;- justify-content: flex-start;- text-align: left;-- &.--danger {- &:hover,- :focus-visible {- background: var(--danger-low);- }- color: var(--danger);-- .d-icon {- color: var(--danger);- }- }- }-- &.--selected .btn {- background: var(--d-selected);-- &:hover,- &:focus-visible {- background: var(--d-selected-hover);- }- }- }-- &__divider {- margin: 0;- height: 0;- }-}diff --git a/app/assets/stylesheets/common/components/notifications-tracking.scss b/app/assets/stylesheets/common/components/notifications-tracking.scssindex 5c2abfd4649..5f2ddfb9e0a 100644--- a/app/assets/stylesheets/common/components/notifications-tracking.scss+++ b/app/assets/stylesheets/common/components/notifications-tracking.scss@@ -8,7 +8,6 @@&__icons {display: flex;align-self: flex-start;- margin-right: 0.75em;}&__texts {diff --git a/app/assets/stylesheets/common/float-kit/d-menu.scss b/app/assets/stylesheets/common/float-kit/d-menu.scssindex fad8fb4ce8e..2936a06ada8 100644--- a/app/assets/stylesheets/common/float-kit/d-menu.scss+++ b/app/assets/stylesheets/common/float-kit/d-menu.scss@@ -96,17 +96,27 @@// should probably be renamed fk-d-menu__list.dropdown-menu {min-width: 200px;- padding: 0;+ display: flex;+ flex-direction: column;+ gap: var(--d-sidebar-vertical-gap);+ padding: var(--space-1);margin: 0;list-style: none;&__item {.btn {- padding: 0.5em 1rem;+ display: inline-flex;+ gap: var(--d-sidebar-section-link-prefix-margin-right);+ padding-inline: var(--d-sidebar-row-horizontal-padding);width: 100%;justify-content: flex-start;background: rgb(0, 0, 0, 0);- border-radius: 0;+ border-radius: var(--d-border-radius);++ &:not(.notifications-tracking-btn, .--with-description) {+ height: var(--d-sidebar-row-height);+ padding-block: 0;+ }&.-selected {background: var(--d-hover);@@ -120,6 +130,11 @@}}+ .svg-icon {+ width: var(--d-sidebar-section-link-prefix-width);+ margin-right: 0;+ }+&:hover,&:focus,&:focus-visible {