A platform for community discussion. Free, open, simple.
DEV: merge desktop user-card CSS into common file (#40800)
Kris98c92845f92d
diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scssindex 694590bdb2c..d7d9513aa99 100644--- a/app/assets/stylesheets/common/components/user-card.scss+++ b/app/assets/stylesheets/common/components/user-card.scss@@ -104,6 +104,7 @@.names {padding-left: 1.25em;+ flex: 1 1 auto;@include viewport.until(sm) {box-sizing: border-box;@@ -114,6 +115,12 @@display: flex;align-items: center;outline: none;++ &:focus-visible {+ border: 1px solid;++ @include default-focus;+ }}.d-icon {@@ -161,8 +168,16 @@}}+ @include viewport.from(sm) {+ max-width: 225px;+ }+button {width: 100%;++ @include viewport.from(sm) {+ min-width: 150px;+ }}}}@@ -183,6 +198,7 @@.d-icon {color: var(--primary);+ font-size: var(--font-down-1);@include viewport.until(sm) {font-size: var(--font-down-2);@@ -443,6 +459,11 @@text-overflow: ellipsis;}}++ @include viewport.from(sm) {+ display: block;+ max-width: 185px;+ }}.user-card-badge-link {@@ -465,8 +486,14 @@}}- .more-user-badges a {- @extend .user-badge;+ .more-user-badges {+ @include viewport.from(sm) {+ max-width: 125px;+ }++ a {+ @extend .user-badge;+ }}}diff --git a/app/assets/stylesheets/desktop/components/_index.scss b/app/assets/stylesheets/desktop/components/_index.scssindex 14c6038a0ed..1747028e386 100644--- a/app/assets/stylesheets/desktop/components/_index.scss+++ b/app/assets/stylesheets/desktop/components/_index.scss@@ -1,4 +1,3 @@@import "header-search";@import "sidebar/edit-navigation-menu/tags-modal";@import "sidebar/sidebar-section";-@import "user-card";diff --git a/app/assets/stylesheets/desktop/components/user-card.scss b/app/assets/stylesheets/desktop/components/user-card.scssdeleted file mode 100644index b6697b61ca6..00000000000--- a/app/assets/stylesheets/desktop/components/user-card.scss+++ /dev/null@@ -1,81 +0,0 @@-@use "lib/viewport";--// shared styles for user and group cards-.user-card,-.group-card {- // avatar - names - controls- .first-row {- .names {- flex: 1 1 auto;- }-- .usercard-controls {- max-width: 225px;-- button {- min-width: 150px;- }- }-- .user-profile-link {- &:focus-visible {- border: 1px solid;-- @include default-focus;- }- }- }-- .names__primary {- .d-icon {- font-size: var(--font-down-1);- }- }-- @include viewport.until(sm) {- // important for keeping the usercard uncropped- // at 200% - 400% zoom levels- --avatar-width: 4em;- --avatar-margin: 0em;-- .names__primary {- font-size: var(--font-up-2);- }-- .first-row {- gap: 0.5em 0;- flex-wrap: wrap;-- .usercard-controls {- max-width: unset;- width: 100%;- display: flex;- flex-wrap: wrap;- gap: 0 0.5em;- }-- li {- flex: 1 1 0;-- &:empty {- display: none;- }- }- }- }-}--// styles for user cards only-.user-card {- // badges- .badge-section {- .user-badge {- display: block;- max-width: 185px;- }-- .more-user-badges {- max-width: 125px;- }- }-}