diff --git a/package-lock.json b/package-lock.json index 44c2dab1e..e9f42673a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ulaval/modul-components", - "version": "1.0.0-beta.17", + "version": "1.0.0-beta.18", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index de4aba574..c593a4f43 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ulaval/modul-components", - "version": "1.0.0-beta.17", + "version": "1.0.0-beta.18", "description": "Component library", "author": "Martin Simard ", "private": false, diff --git a/src/assets/icons/.DS_Store b/src/assets/icons/.DS_Store new file mode 100644 index 000000000..557ef6883 Binary files /dev/null and b/src/assets/icons/.DS_Store differ diff --git a/src/components/accordion/accordion.scss b/src/components/accordion/accordion.scss index 5a91d74db..3a52aae29 100644 --- a/src/components/accordion/accordion.scss +++ b/src/components/accordion/accordion.scss @@ -3,8 +3,8 @@ $m-accordion--icon-l-width: 12px; $m-accordion--icon-width: 10px; $m-accordion--icon-l-height: 2px; $m-accordion--icon-height: 1px; -$m-accordion--border-size: 2px; -$m-accordion--border-color: $m-color--grey-light; +$m-accordion--border-size: $m-border-width; +$m-accordion--border-color: $m-color--border; $m-accordion--color: $m-color--accent; .m-accordion { diff --git a/src/components/datepicker/datepicker.scss b/src/components/datepicker/datepicker.scss index 8843ab062..7682dbaad 100644 --- a/src/components/datepicker/datepicker.scss +++ b/src/components/datepicker/datepicker.scss @@ -62,7 +62,7 @@ $m-datepicker--item-dimension: $m-touch-size !default; &:hover, &:focus { - color: $m-color--black-grey-lighter; + color: $m-color--grey-darker; } } diff --git a/src/components/dialog/dialog.scss b/src/components/dialog/dialog.scss index 1664eedec..18a048b91 100644 --- a/src/components/dialog/dialog.scss +++ b/src/components/dialog/dialog.scss @@ -146,7 +146,7 @@ $m-dialog--max-width--s: 420px !default; &__header { position: relative; - background: $m-color--black-grey; + background-color: var(--m-color--header-dark); color: $m-color--white; display: flex; align-items: center; diff --git a/src/components/dropdown-group/dropdown-group.scss b/src/components/dropdown-group/dropdown-group.scss index f40088be5..a254a05f2 100644 --- a/src/components/dropdown-group/dropdown-group.scss +++ b/src/components/dropdown-group/dropdown-group.scss @@ -1,9 +1,4 @@ @import 'abstracts/variables'; -$m-dropdown--color-hover: $m-color--grey-lightest !default; -$m-dropdown--color-select: $m-color--grey-lighter !default; -$m-dropdown--color-focus: $m-color--interactive-lightest !default; -$m-dropdown--color-active: $m-color--interactive-lightest !default; -$m-dropdown--margin: $m-padding--xs !default; .m-dropdown-group { .m-dropdown-group__header { diff --git a/src/components/dropdown/dropdown.html b/src/components/dropdown/dropdown.html index 2796ed35d..d81c89fab 100644 --- a/src/components/dropdown/dropdown.html +++ b/src/components/dropdown/dropdown.html @@ -1,6 +1,6 @@