Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: color change to re-enforce hierarchy #694

Merged
merged 2 commits into from
Nov 3, 2021
Merged

fix: color change to re-enforce hierarchy #694

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acfff9c
fix: color change to re-enforce hierarchy
Nov 2, 2021
d61c8de
fix: more spacing
Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions src/Components/List/List.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
@import '../../Styles/variables';
@import '../../Styles/typography.scss';

$list-item--text-opacity: 0.666;

$list-item--divider-color--light: rgba($g20-white, 0.03);
$list-item--divider-color--light: $cf-grey-25;
$list-item--divider-text--light: rgba($g20-white, 0.4);
$list-item--background-light: $c-pool;

$list-item--divider-color--dark: rgba($g0-obsidian, 0.08);
$list-item--divider-color--dark: $cf-grey-55;
$list-item--divider-text--dark: rgba($g0-obsidian, 0.4);
$list-item--background-dark: $c-pool;

Expand Down Expand Up @@ -145,18 +146,18 @@ $list-item--background-dark: $c-pool;
*/

.cf-list-divider {
color: $cf-grey-35;
border-radius: $cf-radius-sm;
border-bottom: $cf-border solid $list-item--divider-color--light;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-weight: $cf-font-weight--medium;
@extend %type-uppercase;
}

.cf-list-divider,
.cf-list-divider__thin {
margin-bottom: $cf-border;

&:hover {
cursor: default;
}
Expand All @@ -177,6 +178,7 @@ $list-item--background-dark: $c-pool;
}

.cf-list-divider__light {
color: $cf-grey-55;
&.cf-list-divider {
border-bottom-color: $list-item--divider-color--light;
}
Expand Down Expand Up @@ -217,7 +219,7 @@ $list-item--background-dark: $c-pool;
------------------------------------------------------------------------------
*/

@mixin listItemSizeModifier($fontSize, $padding) {
@mixin listItemSizeModifier($fontSize, $padding, $dividingMargin) {
&.cf-list-item,
&.cf-list-divider,
&.cf-list-link-item > a {
Expand All @@ -240,20 +242,32 @@ $list-item--background-dark: $c-pool;
padding-right: $padding;
}
}

&.cf-list-divider:not(:first-child),
&.cf-list-divider__thin:not(:first-child) {
margin-top: $dividingMargin + $cf-border;
}
&.cf-list-divider,
&.cf-list-divider__thin {
margin-bottom: $dividingMargin + $cf-border;
&:hover {
cursor: default;
}
}
}

.cf-list-item__xs {
@include listItemSizeModifier($cf-form-xs-font, $cf-space-3xs);
@include listItemSizeModifier($cf-form-xs-font, $cf-space-3xs, $cf-space-2xs);
}

.cf-list-item__sm {
@include listItemSizeModifier($cf-form-sm-font, $cf-space-2xs);
@include listItemSizeModifier($cf-form-sm-font, $cf-space-2xs, $cf-space-2xs);
}

.cf-list-item__md {
@include listItemSizeModifier($cf-form-md-font, $cf-space-xs);
@include listItemSizeModifier($cf-form-md-font, $cf-space-xs, $cf-space-xs);
}

.cf-list-item__lg {
@include listItemSizeModifier($cf-form-lg-font, $cf-space-s);
@include listItemSizeModifier($cf-form-lg-font, $cf-space-s, $cf-space-s);
}