From f61ad8da609dc88e5a0e6f905c0e8d16143feb99 Mon Sep 17 00:00:00 2001 From: TetsuhiroSato Date: Fri, 31 May 2024 13:27:04 +0900 Subject: [PATCH] SmartHR UI update --- package.json | 2 +- static/smarthr-ui.css | 52 +++++++++++++++++++++++++++++++++++++++++++ yarn.lock | 49 ++++++++++------------------------------ 3 files changed, 65 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 1337cedbc..1c477af00 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "react-instantsearch-dom": "^6.40.4", "react-live": "^4.1.5", "react-string-replace": "^1.1.1", - "smarthr-ui": "^50.1.0", + "smarthr-ui": "^51.1.0", "styled-components": "^5.3.11" }, "devDependencies": { diff --git a/static/smarthr-ui.css b/static/smarthr-ui.css index 0e8d0e685..898343b6a 100644 --- a/static/smarthr-ui.css +++ b/static/smarthr-ui.css @@ -2036,10 +2036,38 @@ a { background-color: rgb(15 127 133 / var(--tw-bg-opacity)) } +.shr-bg-\[theme\(colors\.grey\.100\)\] { + background-color: #23221e +} + +.shr-bg-\[theme\(colors\.grey\.20\)\] { + background-color: #d6d3d0 +} + +.shr-bg-\[theme\(colors\.grey\.30\)\] { + background-color: #c1bdb7 +} + +.shr-bg-\[theme\(colors\.grey\.5\)\] { + background-color: #f8f7f6 +} + +.shr-bg-\[theme\(colors\.grey\.6\)\] { + background-color: #f5f4f3 +} + .shr-bg-\[theme\(colors\.grey\.65\)\] { background-color: #706d65 } +.shr-bg-\[theme\(colors\.grey\.7\)\] { + background-color: #f2f1f0 +} + +.shr-bg-\[theme\(colors\.grey\.9\)\] { + background-color: #edebe8 +} + .shr-bg-action-background { --tw-bg-opacity: 1; background-color: rgb(214 211 208 / var(--tw-bg-opacity)) @@ -2050,6 +2078,11 @@ a { background-color: rgb(248 247 246 / var(--tw-bg-opacity)) } +.shr-bg-base-grey { + --tw-bg-opacity: 1; + background-color: rgb(245 244 243 / var(--tw-bg-opacity)) +} + .shr-bg-brand { --tw-bg-opacity: 1; background-color: rgb(0 196 204 / var(--tw-bg-opacity)) @@ -2080,6 +2113,11 @@ a { background-color: rgb(0 104 174 / var(--tw-bg-opacity)) } +.shr-bg-over-background { + --tw-bg-opacity: 1; + background-color: rgb(242 241 240 / var(--tw-bg-opacity)) +} + .shr-bg-scrim { background-color: rgba(3,3,2,0.5) } @@ -2670,6 +2708,10 @@ a { transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1) } +.shr-forced-color-adjust-none { + forced-color-adjust: none +} + .\[box-shadow\:_0_-4px_8px_2px_rgba\(0\2c _0\2c _0\2c _0\.24\)\] { box-shadow: 0 -4px 8px 2px rgba(0, 0, 0, 0.24) } @@ -4158,6 +4200,10 @@ a { display: none } + .forced-colors\:shr-border-\[ButtonBorder\] { + border-color: ButtonBorder + } + .forced-colors\:shr-fill-\[CanvasText\] { fill: CanvasText } @@ -4381,6 +4427,12 @@ a { border-color: rgb(255 255 255 / 0.5) } +@media (forced-colors: active) { + .\[\&\&\&_\.smarthr-ui-Loader-line\]\:forced-colors\:shr-border-\[ButtonBorder\].\[\&\&\&_\.smarthr-ui-Loader-line\]\:forced-colors\:shr-border-\[ButtonBorder\].\[\&\&\&_\.smarthr-ui-Loader-line\]\:forced-colors\:shr-border-\[ButtonBorder\] .smarthr-ui-Loader-line { + border-color: ButtonBorder + } +} + .\[\&\&\&_\.smarthr-ui-Loader-spinner\]\:shr-h-em.\[\&\&\&_\.smarthr-ui-Loader-spinner\]\:shr-h-em.\[\&\&\&_\.smarthr-ui-Loader-spinner\]\:shr-h-em .smarthr-ui-Loader-spinner { height: 1em } diff --git a/yarn.lock b/yarn.lock index e6c3152e4..7c685a529 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5215,10 +5215,10 @@ css-loader@^5.2.7: schema-utils "^3.0.0" semver "^7.3.5" -css-loader@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.1.tgz#de4163c0cb765c03d7957eb9e0a49c7f354948c7" - integrity sha512-OxIR5P2mjO1PSXk44bWuQ8XtMK4dpEqpIyERCx3ewOo3I8EmbcxMPUc5ScLtQfgXtOojoMv57So4V/C02HQLsw== +css-loader@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.2.tgz#64671541c6efe06b0e22e750503106bdd86880f8" + integrity sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA== dependencies: icss-utils "^5.1.0" postcss "^8.4.33" @@ -13466,13 +13466,13 @@ smarthr-normalize-css@^1.1.0: dependencies: styled-reset "^4.4.2" -smarthr-ui@^50.1.0: - version "50.1.0" - resolved "https://registry.yarnpkg.com/smarthr-ui/-/smarthr-ui-50.1.0.tgz#cc8563bc14174a7f6b0e7bd967debba9b00f7ea7" - integrity sha512-yKNM2ElHQP5jKBYvYWjExC+kjStBZWYl661BhL1fdZyq3DT5jL9DJF2epb1jGwKTqcbKPUoxvU5xHk1g/fmeRw== +smarthr-ui@^51.1.0: + version "51.1.0" + resolved "https://registry.yarnpkg.com/smarthr-ui/-/smarthr-ui-51.1.0.tgz#567e198ae0c35dfe4b08df401c429f6ff722d566" + integrity sha512-jXpezwvSqTjpMWiQJtWVPeVnpeqpATxhAIdobOw1MVVYXwfwd72dmRruSOimJQCj7g58cBfPqA+aDjLIj6sAjw== dependencies: "@smarthr/wareki" "^1.2.0" - css-loader "^7.1.1" + css-loader "^7.1.2" dayjs "^1.11.11" lodash.merge "^4.6.2" lodash.range "^3.2.0" @@ -13719,16 +13719,7 @@ string-similarity@^1.2.2: lodash.map "^4.6.0" lodash.maxby "^4.6.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13852,7 +13843,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -13873,13 +13864,6 @@ strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -15857,7 +15841,7 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -15875,15 +15859,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"