Skip to content

Commit

Permalink
cleanup (#3228)
Browse files Browse the repository at this point in the history
  • Loading branch information
@emeryro
emeryro committed Feb 13, 2024
1 parent 3bf52a7 commit 921ab60
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 205 deletions.
2 changes: 1 addition & 1 deletion src/implementations/vanilla/components/select/select.scss
View file
Expand Up @@ -239,7 +239,7 @@ $select: null !default;
box-shadow: map.get($select, 'multiple-dropdown-shadow');
box-sizing: border-box;
margin-top: map.get($select, 'multiple-dropdown-margin');
min-width: map.get($theme, 'form', 'm');
min-width: map.get($theme, 'form-width', 's', 'breakpoint-m');
padding-bottom: var(--s-m);
position: absolute;
z-index: map.get($theme, 'z-index', 'dropdown');
Expand Down
5 changes: 0 additions & 5 deletions src/themes/ec/maps/form.scss
View file
@@ -1,8 +1,3 @@
$form: (
's': 158px,
'm': 253px,
'l': 443px,
) !default;
$form-width: (
's': (
'breakpoint-xs': 100%,
Expand Down
41 changes: 0 additions & 41 deletions src/themes/ec/maps/shape.scss
View file
Expand Up @@ -26,44 +26,3 @@ $shadow: (
64px 64px 96px rgba($shadow-color, 0.05),
0 1px 0 $shadow-inline-color inset},
) !default;

// TODO: remove what is below when all components are updated
$shadow-inner: (
'1': #{0 2px 4px rgba($shadow-color, 0.08) inset,
0 0 10px rgba($shadow-color, 0.04) inset,
0 4px 5px rgba($shadow-color, 0.04) inset,
0 #{-4px} 4px rgba($shadow-color, 0.04) inset},
'2': #{0 3px 5px rgba($shadow-color, 0.04) inset,
0 0 18px rgba($shadow-color, 0.04) inset,
0 6px 10px rgba($shadow-color, 0.04) inset,
0 #{-4px} 4px rgba($shadow-color, 0.04) inset},
) !default;
$shadow-negative-color: #fff !default;
$shadow-negative: (
'1': #{0 2px 4px rgba($shadow-negative-color, 0.08),
0 0 10px rgba($shadow-negative-color, 0.04),
0 4px 5px rgba($shadow-negative-color, 0.04),
0 #{-4px} 4px rgba($shadow-negative-color, 0.04)},
'2': #{0 3px 5px rgba($shadow-negative-color, 0.04),
0 0 18px rgba($shadow-negative-color, 0.04),
0 6px 10px rgba($shadow-negative-color, 0.04),
0 #{-4px} 4px rgba($shadow-negative-color, 0.04)},
'3': #{0 7px 8px rgba($shadow-negative-color, 0.08),
0 0 22px rgba($shadow-negative-color, 0.04),
0 12px 17px rgba($shadow-negative-color, 0.04),
0 #{-4px} 4px rgba($shadow-negative-color, 0.04)},
'4': #{0 11px 15px rgba($shadow-color, 0.08),
0 9px 46px rgba($shadow-color, 0.04),
0 24px 38px rgba($shadow-color, 0.04),
0 #{-4px} 4px rgba($shadow-color, 0.04)},
) !default;
$shadow-negative-inner: (
'1': #{0 2px 4px rgba($shadow-negative-color, 0.08) inset,
0 0 10px rgba($shadow-negative-color, 0.04) inset,
0 4px 5px rgba($shadow-negative-color, 0.04) inset,
0 #{-4px} 4px rgba($shadow-negative-color, 0.04) inset},
'2': #{0 3px 5px rgba($shadow-negative-color, 0.04) inset,
0 0 18px rgba($shadow-negative-color, 0.04) inset,
0 6px 10px rgba($shadow-negative-color, 0.04) inset,
0 #{-4px} 4px rgba($shadow-negative-color, 0.04) inset},
) !default;
141 changes: 0 additions & 141 deletions src/themes/ec/maps/typography.scss
View file
Expand Up @@ -16,11 +16,6 @@ $font-size: (
'2xl': 1.75rem,
'3xl': 2rem,
'4xl': 2.5rem,

// TODO: Old font sizes, to be removed once components are updated
'2xs': 0.625rem,
'5xl': 2.25rem,
'6xl': 2.625rem,
) !default;
$line-height: (
'xs': 1.25rem,
Expand All @@ -31,11 +26,6 @@ $line-height: (
'2xl': 2.5rem,
'3xl': 2.75rem,
'4xl': 3rem,

// TODO: Old line height, to be removed once components are updated
'2xs': 1rem,
'5xl': 2.75rem,
'6xl': 3.25rem,
) !default;
$font-weight: (
'regular': 400,
Expand Down Expand Up @@ -68,20 +58,6 @@ $font: (
$font-size,
'4xl'
) + '/' + map.get($line-height, '4xl')} #{map.get($font-family, 'default')},

// TODO: Old font, to be removed once components are updated
'2xs': normal normal map.get($font-weight, 'regular') #{map.get(
$font-size,
'2xs'
) + '/' + map.get($line-height, '2xs')} #{map.get($font-family, 'default')},
'5xl': normal normal map.get($font-weight, 'regular') #{map.get(
$font-size,
'5xl'
) + '/' + map.get($line-height, '5xl')} #{map.get($font-family, 'default')},
'6xl': normal normal map.get($font-weight, 'regular') #{map.get(
$font-size,
'6xl'
) + '/' + map.get($line-height, '6xl')} #{map.get($font-family, 'default')},
) !default;

// Print
Expand All @@ -104,11 +80,6 @@ $font-size-print: (
'2xl': 18.38pt,
'3xl': 21pt,
'4xl': 26.5pt,

// TODO: Old font sizes, to be removed once components are updated
'2xs': 6.56pt,
'5xl': 23.63pt,
'6xl': 27.56pt,
) !default;
$line-height-print: (
'xs': 15pt,
Expand All @@ -119,11 +90,6 @@ $line-height-print: (
'2xl': 30pt,
'3xl': 33pt,
'4xl': 36pt,

// TODO: Old line height, to be removed once components are updated
'2xs': 12pt,
'5xl': 33pt,
'6xl': 39pt,
) !default;
$font-weight-print: (
'regular': 400,
Expand Down Expand Up @@ -186,111 +152,4 @@ $font-print: (
$font-family-print,
'default'
)},

// TODO: Old font, to be removed once components are updated
'2xs': normal normal map.get($font-weight-print, 'regular') #{map.get(
$font-size-print,
'2xs'
) + '/' + map.get($line-height-print, '2xs')} #{map.get(
$font-family-print,
'default'
)},
'5xl': normal normal map.get($font-weight-print, 'regular') #{map.get(
$font-size-print,
'5xl'
) + '/' + map.get($line-height-print, '5xl')} #{map.get(
$font-family-print,
'default'
)},
'6xl': normal normal map.get($font-weight-print, 'regular') #{map.get(
$font-size-print,
'6xl'
) + '/' + map.get($line-height-print, '6xl')} #{map.get(
$font-family-print,
'default'
)},
) !default;

// TODO: remove what is below when all components are updated
$line-height-prolonged: (
'xs': 1.25rem,
's': 1.25rem,
'm': 1.5rem,
'l': 1.75rem,
'xl': 1.75rem,
) !default;
$font-prolonged: (
'xs': normal normal map.get($font-weight, 'regular') #{map.get(
$font-size,
'xs'
) + '/' + map.get($line-height-prolonged, 'xs')} #{map.get(
$font-family,
'default'
)},
's': normal normal map.get($font-weight, 'regular') #{map.get($font-size, 's') +
'/' + map.get($line-height-prolonged, 's')} #{map.get(
$font-family,
'default'
)},
'm': normal normal map.get($font-weight, 'regular') #{map.get($font-size, 'm') +
'/' + map.get($line-height-prolonged, 'm')} #{map.get(
$font-family,
'default'
)},
'l': normal normal map.get($font-weight, 'regular') #{map.get($font-size, 'l') +
'/' + map.get($line-height-prolonged, 'l')} #{map.get(
$font-family,
'default'
)},
'xl': normal normal map.get($font-weight, 'regular') #{map.get(
$font-size,
'xl'
) + '/' + map.get($line-height-prolonged, 'xl')} #{map.get(
$font-family,
'default'
)},
) !default;
$line-height-prolonged-print: (
'xs': 15pt,
's': 15pt,
'm': 15pt,
'l': 18pt,
'xl': 21pt,
) !default;
$font-prolonged-print: (
'xs': normal normal map.get($font-weight-print, 'regular') #{map.get(
$font-size-print,
'xs'
) + '/' + map.get($line-height-prolonged-print, 'xs')} #{map.get(
$font-family,
'default'
)},
's': normal normal map.get($font-weight-print, 'regular') #{map.get(
$font-size-print,
's'
) + '/' + map.get($line-height-prolonged-print, 's')} #{map.get(
$font-family,
'default'
)},
'm': normal normal map.get($font-weight-print, 'regular') #{map.get(
$font-size-print,
'm'
) + '/' + map.get($line-height-prolonged-print, 'm')} #{map.get(
$font-family,
'default'
)},
'l': normal normal map.get($font-weight-print, 'regular') #{map.get(
$font-size-print,
'l'
) + '/' + map.get($line-height-prolonged-print, 'l')} #{map.get(
$font-family,
'default'
)},
'xl': normal normal map.get($font-weight-print, 'regular') #{map.get(
$font-size-print,
'xl'
) + '/' + map.get($line-height-prolonged-print, 'xl')} #{map.get(
$font-family,
'default'
)},
) !default;
9 changes: 0 additions & 9 deletions src/themes/ec/theme.scss
View file
Expand Up @@ -6,7 +6,6 @@
// TODO: build this dynamically (if possible)
$theme: (
color: index.$color,
form: index.$form,
form-width: index.$form-width,
icon: index.$icon,
icon-print: index.$icon-print,
Expand All @@ -18,25 +17,17 @@ $theme: (
border-radius: index.$border-radius,
shadow-color: index.$shadow-color,
shadow: index.$shadow,
shadow-inner: index.$shadow-inner,
shadow-negative-color: index.$shadow-negative-color,
shadow-negative: index.$shadow-negative,
shadow-negative-inner: index.$shadow-negative-inner,
spacing: index.$spacing,
spacing-print: index.$spacing-print,
font-family: index.$font-family,
font-size: index.$font-size,
line-height: index.$line-height,
line-height-prolonged: index.$line-height-prolonged,
font-weight: index.$font-weight,
font: index.$font,
font-prolonged: index.$font-prolonged,
font-family-print: index.$font-family-print,
font-size-print: index.$font-size-print,
line-height-print: index.$line-height-print,
line-height-prolonged-print: index.$line-height-prolonged-print,
font-weight-print: index.$font-weight-print,
font-print: index.$font-print,
font-prolonged-print: index.$font-prolonged-print,
z-index: index.$z-index,
);
7 changes: 0 additions & 7 deletions src/themes/eu/maps/form.scss
View file
@@ -1,10 +1,3 @@
// TODO: remove $form variable once all form components have been updated
// new $form-width variable depends on the different breakpoints
$form: (
's': 158px,
'm': 253px,
'l': 443px,
) !default;
$form-width: (
's': (
'breakpoint-xs': 100%,
Expand Down
1 change: 0 additions & 1 deletion src/themes/eu/theme.scss
View file
Expand Up @@ -6,7 +6,6 @@
// TODO: build this dynamically (if possible)
$theme: (
color: index.$color,
form: index.$form,
form-width: index.$form-width,
icon: index.$icon,
icon-print: index.$icon-print,
Expand Down

1 comment on commit 921ab60

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 Deployed on https://v4-dev--europa-component-library.netlify.app

Please sign in to comment.