Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions packages/styles/src/components/card.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@use './../variables/commons';
@use './../mixins/icons' as icons-mx;
@use './../variables/icons';
@use '../mixins/utilities' as utilities-mx;

@use './../functions/tokens';
Expand Down Expand Up @@ -107,8 +106,8 @@ tokens.$default-map: components.$post-cards;
@include icons-mx.mask-image('arrowright');
content: '';
display: inline-block;
width: icons.$icon-size-default;
height: icons.$icon-size-default;
width: 1.5rem;
height: 1.5rem;
}
}
}
Expand Down
12 changes: 2 additions & 10 deletions packages/styles/src/components/form-input.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
@use './../functions/tokens';
@use './../tokens/components';
@use './../tokens/elements';
@use './../mixins/forms' as forms-mx;
@use './../mixins/utilities';
@use './../mixins/icons' as icons-mx;
@use './../variables/components/forms';

tokens.$default-map: components.$post-text-input;

@include icons-mx.custom-property(('success-solid', 'warning-solid'));

input.form-control {
display: block;
width: 100%;
Expand Down Expand Up @@ -223,8 +217,7 @@ input.form-control {
right: tokens.get('input-validation-icon-position-inline-end');
z-index: 2;
pointer-events: none;
@include icons-mx.mask-image('success-solid');
color: tokens.get('post-validation-success', components.$post-validation);
background-image: var(--post-signal-icon-success);
}

&:has(> input.form-control.is-invalid:not(:disabled))::after,
Expand All @@ -236,8 +229,7 @@ input.form-control {
right: tokens.get('input-validation-icon-position-inline-end');
z-index: 1;
pointer-events: none;
@include icons-mx.mask-image('warning-solid');
color: tokens.get('post-validation-error', components.$post-validation);
background-image: var(--post-signal-icon-error);
}

> input.form-control ~ label {
Expand Down
36 changes: 20 additions & 16 deletions packages/styles/src/components/form-select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,53 +109,53 @@ tokens.$default-map: components.$post-select;
}

&.is-valid:not(:disabled) {
background-image: forms-fx.select-arrow-icon('enabled'), forms-fx.success-icon();
background-image: forms-fx.select-arrow-icon('enabled'), var(--post-signal-icon-success);

&:focus {
background-image: forms-fx.select-arrow-icon('selected'), forms-fx.success-icon();
background-image: forms-fx.select-arrow-icon('selected'), var(--post-signal-icon-success);
}

&:hover {
&:not([multiple]) {
background-image: forms-fx.select-arrow-icon('hover'), forms-fx.success-icon();
background-image: forms-fx.select-arrow-icon('hover'), var(--post-signal-icon-success);
}
}

&,
&:hover:not([multiple]),
&:focus {
@include utilities.high-contrast-mode-dark() {
background-image: forms-fx.select-arrow-icon('enabled'), forms-fx.success-icon(#e0e0e0);
background-image: forms-fx.select-arrow-icon('enabled'), var(--post-signal-icon-success);
}

@include utilities.high-contrast-mode-light() {
background-image: forms-fx.select-arrow-icon('enabled'), forms-fx.success-icon(#333);
background-image: forms-fx.select-arrow-icon('enabled'), var(--post-signal-icon-success);
}
}
}

&.is-invalid:not(:disabled) {
background-image: forms-fx.select-arrow-icon('enabled'), forms-fx.warning-icon();
background-image: forms-fx.select-arrow-icon('enabled'), var(--post-signal-icon-error);

&:focus {
background-image: forms-fx.select-arrow-icon('selected'), forms-fx.warning-icon();
background-image: forms-fx.select-arrow-icon('selected'), var(--post-signal-icon-error);
}

&:hover {
&:not([multiple]) {
background-image: forms-fx.select-arrow-icon('hover'), forms-fx.warning-icon();
background-image: forms-fx.select-arrow-icon('hover'), var(--post-signal-icon-error);
}
}

&,
&:hover:not([multiple]),
&:focus {
@include utilities.high-contrast-mode-dark() {
background-image: forms-fx.select-arrow-icon('enabled'), forms-fx.warning-icon(#e0e0e0);
background-image: forms-fx.select-arrow-icon('enabled'), var(--post-signal-icon-error);
}

@include utilities.high-contrast-mode-light() {
background-image: forms-fx.select-arrow-icon('enabled'), forms-fx.warning-icon(#333);
background-image: forms-fx.select-arrow-icon('enabled'), var(--post-signal-icon-error);
}
}
}
Expand Down Expand Up @@ -278,26 +278,30 @@ tokens.$default-map: components.$post-select;
}

&.is-valid:not(:disabled) {
background-image: forms-fx.select-arrow-icon('enabled', 'dark'), forms-fx.success-icon();
background-image: forms-fx.select-arrow-icon('enabled', 'dark'),
var(--post-signal-icon-success);

&:focus {
background-image: forms-fx.select-arrow-icon('selected', 'dark'), forms-fx.success-icon();
background-image: forms-fx.select-arrow-icon('selected', 'dark'),
var(--post-signal-icon-success);
}

&:hover {
background-image: forms-fx.select-arrow-icon('hover', 'dark'), forms-fx.success-icon();
background-image: forms-fx.select-arrow-icon('hover', 'dark'),
var(--post-signal-icon-success);
}
}

&.is-invalid:not(:disabled) {
background-image: forms-fx.select-arrow-icon('enabled', 'dark'), forms-fx.warning-icon();
background-image: forms-fx.select-arrow-icon('enabled', 'dark'), var(--post-signal-icon-error);

&:focus {
background-image: forms-fx.select-arrow-icon('selected', 'dark'), forms-fx.warning-icon();
background-image: forms-fx.select-arrow-icon('selected', 'dark'),
var(--post-signal-icon-error);
}

&:hover {
background-image: forms-fx.select-arrow-icon('hover', 'dark'), forms-fx.warning-icon();
background-image: forms-fx.select-arrow-icon('hover', 'dark'), var(--post-signal-icon-error);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/styles/src/components/form-textarea.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ textarea.form-control {
&.is-valid,
&.is-invalid {
&:not(:disabled) {
background-size: tokens.get('textarea-sizing-icon');
background-size: tokens.get('textarea-sizing-icon') tokens.get('textarea-sizing-icon');
background-position: top tokens.get('textarea-position-block-start-validation') right
tokens.get('textarea-position-inline-end-validation');
background-repeat: no-repeat;
Expand Down
8 changes: 2 additions & 6 deletions packages/styles/src/components/validation.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
@use 'sass:map';
@use '../functions/tokens';
@use '../functions/icons';
@use './../mixins/icons' as icons-mx;
@use '../tokens/components';

tokens.$default-map: components.$post-validation;

@include icons-mx.custom-property(('warning-solid', 'success-solid'));

/*
Default feedback message classes
*/
Expand Down Expand Up @@ -113,10 +109,10 @@ input[type='radio'],
}

~ .invalid-feedback::before {
@include icons-mx.mask-image('warning-solid');
background-image: var(--post-signal-icon-error);
}

~ .valid-feedback::before {
@include icons-mx.mask-image('success-solid');
background-image: var(--post-signal-icon-success);
}
}
10 changes: 0 additions & 10 deletions packages/styles/src/functions/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,3 @@

@return $state;
}

@function success-icon($color: #107800) {
$icon: icons.get-colored-svg-url('success', $color);
@return url('#{$icon}');
}

@function warning-icon($color: #b20000) {
$icon: icons.get-colored-svg-url('warning', $color);
@return url('#{$icon}');
}
10 changes: 3 additions & 7 deletions packages/styles/src/functions/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

@use './color';
@use './utilities';
@use './../variables/icons';
@use '../svg-icon-map' as icon-vars;

@function add-fill-color($svg, $color) {
@if (meta.type-of($color) == string) {
Expand Down Expand Up @@ -59,12 +59,8 @@
@function get-svg-url($icon-name) {
$svg-url: '';

@if (map.has-key(icons.$svg-icon-map, #{$icon-name})) {
$svg-url: map.get(icons.$svg-icon-map, #{$icon-name});
} @else if(map.has-key(icons.$other-icons, #{$icon-name})) {
$svg-url: icons.$svg-pre-path +
map.get(icons.$other-icons, #{$icon-name}) +
icons.$svg-post-path;
@if (map.has-key(icon-vars.$svg-icon-map, #{$icon-name})) {
$svg-url: map.get(icon-vars.$svg-icon-map, #{$icon-name});
} @else {
@error "Icon '#{$icon-name}' does not exist.";
}
Expand Down
13 changes: 6 additions & 7 deletions packages/styles/src/mixins/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@use './../variables/components/forms';
@use './../mixins/utilities';
@use './../functions/icons';
@use './../functions/forms' as forms-fx;
@use './../functions/utilities' as utilities-fx;
@use './../variables/color';

Expand All @@ -21,26 +20,26 @@
// Used on form elements to set the correct colored validation icon
@mixin validation-icons() {
&.is-valid:not(:disabled) {
background-image: forms-fx.success-icon();
background-image: var(--post-signal-icon-success);

@include utilities.high-contrast-mode-dark() {
background-image: forms-fx.success-icon(#e0e0e0);
background-image: var(--post-signal-icon-success);
}

@include utilities.high-contrast-mode-light() {
background-image: forms-fx.success-icon(#333);
background-image: var(--post-signal-icon-success);
}
}

&.is-invalid:not(:disabled) {
background-image: forms-fx.warning-icon();
background-image: var(--post-signal-icon-error);

@include utilities.high-contrast-mode-dark() {
background-image: forms-fx.warning-icon(#e0e0e0);
background-image: var(--post-signal-icon-error);
}

@include utilities.high-contrast-mode-light() {
background-image: forms-fx.warning-icon(#333);
background-image: var(--post-signal-icon-error);
}
}
}
Expand Down
40 changes: 0 additions & 40 deletions packages/styles/src/variables/_icons.scss

This file was deleted.

1 change: 0 additions & 1 deletion packages/styles/src/variables/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
@forward 'commons';
@forward 'elevation';
@forward 'grid';
@forward 'icons';
@forward 'spacing';
@forward 'sizing';
@forward 'type';
Expand Down
2 changes: 1 addition & 1 deletion packages/styles/tests/functions/icons.test.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'src/functions/icons';
@use 'src/variables/icons' as icon-vars;
@use 'src/svg-icon-map' as icon-vars;
@use 'src/variables/color';
@use 'tests/jest';
@use 'sass:map';
Expand Down
Loading