diff --git a/package.json b/package.json index b5dd2eb66..056be1de6 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "sass": "1.83.4", "slugify": "^1.6.6", "stylelint": "^16.9.0", - "stylelint-config-standard": "^36.0.1", + "stylelint-config-standard": "^37.0.0", "stylelint-config-standard-scss": "^14.0.0", "stylelint-scss": "^6.5.1", "ts-jest": "^29.2.5", diff --git a/src/stylesheets/datepicker.scss b/src/stylesheets/datepicker.scss index 471fab9c0..7ee7de569 100644 --- a/src/stylesheets/datepicker.scss +++ b/src/stylesheets/datepicker.scss @@ -13,7 +13,7 @@ font-size: $datepicker__font-size; background-color: #fff; color: $datepicker__text-color; - border: 1px solid $datepicker__border-color; + border: $datepicker__border; border-radius: $datepicker__border-radius; display: inline-block; position: relative; @@ -62,7 +62,7 @@ .react-datepicker__header { text-align: center; background-color: $datepicker__background-color; - border-bottom: 1px solid $datepicker__border-color; + border-bottom: $datepicker__border; border-top-left-radius: $datepicker__border-radius; padding: 8px 0; position: relative; @@ -268,7 +268,7 @@ h2.react-datepicker__current-month { .react-datepicker__time-container { float: right; - border-left: 1px solid $datepicker__border-color; + border-left: $datepicker__border; width: 85px; &--with-today-button { @@ -491,7 +491,7 @@ h2.react-datepicker__current-month { } &--in-selecting-range:not(&--in-range) { - background-color: rgba($datepicker__selected-color, 0.5); + background-color: $datepicker__selected-color--disabled; } &--in-range:not(&--in-selecting-range) { @@ -582,7 +582,7 @@ h2.react-datepicker__current-month { z-index: 1; text-align: center; border-radius: $datepicker__border-radius; - border: 1px solid $datepicker__border-color; + border: $datepicker__border; &:hover { cursor: pointer; @@ -682,7 +682,7 @@ h2.react-datepicker__current-month { .react-datepicker__today-button { background: $datepicker__background-color; - border-top: 1px solid $datepicker__border-color; + border-top: $datepicker__border; cursor: pointer; text-align: center; font-weight: bold; diff --git a/src/stylesheets/variables.scss b/src/stylesheets/variables.scss index 3ab4cf952..750d2011f 100644 --- a/src/stylesheets/variables.scss +++ b/src/stylesheets/variables.scss @@ -6,12 +6,14 @@ $datepicker__highlighted-color: #3dcc4a !default; $datepicker__holidays-color: #ff6803 !default; $datepicker__muted-color: #ccc !default; $datepicker__selected-color: #216ba5 !default; +$datepicker__selected-color--disabled: rgba($datepicker__selected-color, 0.5); $datepicker__text-color: #000 !default; $datepicker__header-color: #000 !default; $datepicker__navigation-disabled-color: color.adjust( $datepicker__muted-color, $lightness: 10% ) !default; +$datepicker__border: 1px solid $datepicker__border-color; $datepicker__border-radius: 0.3rem !default; $datepicker__day-margin: 0.166rem !default; $datepicker__font-size: 0.8rem !default; diff --git a/yarn.lock b/yarn.lock index 8df4bc0bf..eca39b33a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8553,7 +8553,7 @@ __metadata: sass: "npm:1.83.4" slugify: "npm:^1.6.6" stylelint: "npm:^16.9.0" - stylelint-config-standard: "npm:^36.0.1" + stylelint-config-standard: "npm:^37.0.0" stylelint-config-standard-scss: "npm:^14.0.0" stylelint-scss: "npm:^6.5.1" ts-jest: "npm:^29.2.5" @@ -9694,6 +9694,15 @@ __metadata: languageName: node linkType: hard +"stylelint-config-recommended@npm:^15.0.0": + version: 15.0.0 + resolution: "stylelint-config-recommended@npm:15.0.0" + peerDependencies: + stylelint: ^16.13.0 + checksum: 10c0/de82e675e7d0cdbc486beee1f76002d5a5676247c1780fbe04f6adb617b016033f18f3361f4e99a76fc4d2115fbfc97786d9cf87ee7d90a345e146de35b04ab8 + languageName: node + linkType: hard + "stylelint-config-standard-scss@npm:^14.0.0": version: 14.0.0 resolution: "stylelint-config-standard-scss@npm:14.0.0" @@ -9721,6 +9730,17 @@ __metadata: languageName: node linkType: hard +"stylelint-config-standard@npm:^37.0.0": + version: 37.0.0 + resolution: "stylelint-config-standard@npm:37.0.0" + dependencies: + stylelint-config-recommended: "npm:^15.0.0" + peerDependencies: + stylelint: ^16.13.0 + checksum: 10c0/99c184384126f8676061c857e36d6d58fd9b391c1c1ec94a3f019c23ba1e0dc7665fc064a630f6ee66bc8624a6fd850fc7ab33ff086f5fde7b46d4ae0d92edf5 + languageName: node + linkType: hard + "stylelint-scss@npm:^6.4.0, stylelint-scss@npm:^6.5.1": version: 6.10.1 resolution: "stylelint-scss@npm:6.10.1"