From 94b37aaed0795869a5583d1699b54cf1543025d7 Mon Sep 17 00:00:00 2001 From: yutoyoshiyama <95469229+ytysym@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:19:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?SmartHR=20UI=E3=82=92v41.2.0=E3=81=AB?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- static/smarthr-ui.css | 148 +++++++++++++++++++++++------------------- yarn.lock | 18 ++--- 3 files changed, 92 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index bc23f7cdc..9e4446157 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": "^41.1.2", + "smarthr-ui": "^41.2.0", "styled-components": "^5.3.11" }, "devDependencies": { diff --git a/static/smarthr-ui.css b/static/smarthr-ui.css index 46a99e80f..2908bc321 100644 --- a/static/smarthr-ui.css +++ b/static/smarthr-ui.css @@ -1255,6 +1255,84 @@ margin-left: calc(-1px * calc(1 - var(--tw-space-x-reverse))) } +.shr-space-y-0 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0px * var(--tw-space-y-reverse)) +} + +.shr-space-y-0\.25 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(4px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(4px * var(--tw-space-y-reverse)) +} + +.shr-space-y-0\.5 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(8px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(8px * var(--tw-space-y-reverse)) +} + +.shr-space-y-0\.75 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(12px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(12px * var(--tw-space-y-reverse)) +} + +.shr-space-y-1 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(16px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(16px * var(--tw-space-y-reverse)) +} + +.shr-space-y-1\.25 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(20px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(20px * var(--tw-space-y-reverse)) +} + +.shr-space-y-1\.5 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(24px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(24px * var(--tw-space-y-reverse)) +} + +.shr-space-y-2 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(32px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(32px * var(--tw-space-y-reverse)) +} + +.shr-space-y-2\.5 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(40px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(40px * var(--tw-space-y-reverse)) +} + +.shr-space-y-3 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(48px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(48px * var(--tw-space-y-reverse)) +} + +.shr-space-y-3\.5 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(56px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(56px * var(--tw-space-y-reverse)) +} + +.shr-space-y-4 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(64px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(64px * var(--tw-space-y-reverse)) +} + +.shr-space-y-8 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(128px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(128px * var(--tw-space-y-reverse)) +} + .shr-self-stretch { align-self: stretch } @@ -1449,11 +1527,6 @@ border-color: unset } -.shr-border-brand { - --tw-border-opacity: 1; - border-color: rgb(0 196 204 / var(--tw-border-opacity)) -} - .shr-border-current { border-color: currentColor } @@ -3046,11 +3119,6 @@ border-color: rgb(35 34 30 / var(--tw-border-opacity)) } - .contrast-more\:shr-border-main { - --tw-border-opacity: 1; - border-color: rgb(0 119 199 / var(--tw-border-opacity)) - } - .contrast-more\:before\:shr-absolute::before { content: var(--tw-content); position: absolute @@ -3244,8 +3312,8 @@ visibility: visible } -.\[\&\.entered\]\:shr-max-h-screen.entered { - max-height: 100vh +.\[\&\.entered\]\:shr-max-h-\[revert\].entered { + max-height: revert } .\[\&\.entered\]\:shr-opacity-100.entered { @@ -3458,10 +3526,6 @@ box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow) } -.\[\&_\>_\*\:nth-child\(2\)\]\:shr-mb-auto > *:nth-child(2) { - margin-bottom: auto -} - .\[\&_\>_\*\]\:shr-my-0 > * { margin-top: 0; margin-bottom: 0 @@ -3475,56 +3539,8 @@ flex-basis: auto } -.\[\&_\>_\*_\+_\*\]\:shr-mt-0 > * + * { - margin-top: 0 -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-0\.25 > * + * { - margin-top: 4px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-0\.5 > * + * { - margin-top: 8px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-0\.75 > * + * { - margin-top: 12px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-1 > * + * { - margin-top: 16px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-1\.25 > * + * { - margin-top: 20px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-1\.5 > * + * { - margin-top: 24px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-2 > * + * { - margin-top: 32px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-2\.5 > * + * { - margin-top: 40px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-3 > * + * { - margin-top: 48px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-3\.5 > * + * { - margin-top: 56px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-4 > * + * { - margin-top: 64px -} - -.\[\&_\>_\*_\+_\*\]\:shr-mt-8 > * + * { - margin-top: 128px +.\[\&_\>_\:not\(\[hidden\]\)\:nth-child\(2\)\]\:shr-mb-auto > :not([hidden]):nth-child(2) { + margin-bottom: auto } .\[\&_svg\]\:shr-block svg { diff --git a/yarn.lock b/yarn.lock index cd5c720c7..f27c79c36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12834,10 +12834,10 @@ pluralize@^2.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-2.0.0.tgz#72b726aa6fac1edeee42256c7d8dc256b335677f" integrity sha1-crcmqm+sHt7uQiVsfY3CVrM1Z38= -polished@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/polished/-/polished-4.2.2.tgz#2529bb7c3198945373c52e34618c8fe7b1aa84d1" - integrity sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ== +polished@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/polished/-/polished-4.3.1.tgz#5a00ae32715609f83d89f6f31d0f0261c6170548" + integrity sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA== dependencies: "@babel/runtime" "^7.17.8" @@ -14696,16 +14696,16 @@ smarthr-normalize-css@^1.1.0: dependencies: styled-reset "^4.4.2" -smarthr-ui@^41.1.2: - version "41.1.2" - resolved "https://registry.yarnpkg.com/smarthr-ui/-/smarthr-ui-41.1.2.tgz#47f7e0f974d73debeac450726549c3e3d78aef11" - integrity sha512-nTrUc+Nmnz02tVz2gueVkvq/pa0tCjKAPg/+A3tvc0KEGn9Cr6blZfqNKXOFP4Ze9cqoyNbbByMhOiFaY5rV3w== +smarthr-ui@^41.2.0: + version "41.2.0" + resolved "https://registry.yarnpkg.com/smarthr-ui/-/smarthr-ui-41.2.0.tgz#af3ff96a4675ab03fe687e67b2575fc405ecbb7f" + integrity sha512-xjMSe5q7v9+MPVZ69T1BfLBVwBamofhG496cFs0zTcl7RTPipIdQD9ldovD9pmz1/9F3JOmRmwBhpQIkRHNrZg== dependencies: "@smarthr/wareki" "^1.2.0" dayjs "^1.11.10" lodash.merge "^4.6.2" lodash.range "^3.2.0" - polished "^4.2.2" + polished "^4.3.0" react-draggable "^4.4.6" react-icons "^5.0.1" react-innertext "^1.1.5" From e13e2010b5a7a9e81d7d506f1e35683a54205730 Mon Sep 17 00:00:00 2001 From: uknmr Date: Fri, 16 Feb 2024 20:48:23 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20CI=20=E3=82=92=E5=9B=9E=E3=81=99?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AE=E7=A9=BA=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit