Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

🐛 fix(password): placement checkbox & icon info [DS-3668] #832

Merged
merged 3 commits into from
Nov 28, 2023
Merged

🐛 fix(password): placement checkbox & icon info [DS-3668] #832

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
504823f
fix(password): met a jour icone de message information
zellerbaptiste Nov 22, 2023
0718265
fix(password): met a jour le placement de la checkbox
zellerbaptiste Nov 23, 2023
03d6b90
fix(password): mise a jour du composant
zellerbaptiste Nov 24, 2023
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
2 changes: 1 addition & 1 deletion src/component/form/deprecated/style/_module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,5 @@
}

#{ns(info-text)} {
@include icon-image(information-fill, before);
@include icon-image(info-fill, before);
Copy link
Contributor

Choose a reason for hiding this comment

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

pourquoi info-fill ? c'est plus information-fill ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

non l'icône information-fill a un fond de forme ronde alors que info-fill une forme carrée ce que l'on veut dans ce cas.

}
2 changes: 1 addition & 1 deletion src/component/form/style/_legacy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}

&--info {
@include icon-legacy(information-fill, sm);
@include icon-legacy(info-fill, sm);
}
}
}
2 changes: 1 addition & 1 deletion src/component/form/style/module/_message.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
}

&--info {
@include icon-image(information-fill, before);
@include icon-image(info-fill, before);
}
}
2 changes: 1 addition & 1 deletion src/component/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import './accordion/main.js';
import './button/main.js';
import './card/main.js';
import './segmented/main.js';
import './range/main.js';
import './breadcrumb/main.js';
import './tooltip/main.js';
import './toggle/main.js';
Expand All @@ -16,6 +15,7 @@ import './table/main.js';
import './tag/main.js';
import './transcription/main.js';
import './tile/main.js';
import './range/main.js';
import './header/main.js';
import './display/main.js';
export default api;
16 changes: 12 additions & 4 deletions src/component/password/style/_legacy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@
////

@use 'module/legacy';
@use 'module/spacing';

// @include legacy.is(ie11) {
// #{ns(password)} {
@include legacy.is(ie11) {
#{ns(password)} {
&__checkbox {
@include absolute(0, 0);
@include margin(0);

// }
// }
input[type="checkbox"] {
top: spacing.space(-2v);
}
}
}
}
16 changes: 10 additions & 6 deletions src/component/password/style/_module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#{ns(password)} {
@include relative;
@include display-flex(column);
@include set-text-margin(0 0 2v 0);

#{ns-attr(capslock)} {
Expand All @@ -19,7 +20,9 @@
}

&__checkbox {
@include absolute(0, 0);
order: -1;
@include margin-top(-6v);
@include margin-left(auto);
}

&__input {
Expand All @@ -34,21 +37,22 @@
}
}

&__label {
@include padding-right(24v);
& > #{ns(label)} {
order: -1;
max-width: calc(100% - #{space(24v)});
}

#{ns(message)} {
&:first-child {
--comma: " ";
--comma: ' ';
}
}

#{ns(message--valid)}#{ns-attr(valid)} {
--content: "\00a0-\00a0" attr(#{ns-attr(valid, null, true)}) var(--comma);
--content: '\00a0-\00a0'attr(#{ns-attr(valid, null, true)}) var(--comma);
}

#{ns(message--error)}#{ns-attr(error)} {
--content: "\00a0-\00a0" attr(#{ns-attr(error, null, true)}) var(--comma);
--content: '\00a0-\00a0'attr(#{ns-attr(error, null, true)}) var(--comma);
}
}
2 changes: 1 addition & 1 deletion src/core/style/action/module/_input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ input::-webkit-credentials-auto-fill-button {
@include margin-left(4v);
@include margin-right(-1px);
@include size(5v, 5v);
mask-size: #{spacing.space(5v 5v)};
-webkit-mask-size: #{spacing.space(5v 5v)};
}