diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 62b812245..34168b0c7 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -94,6 +94,7 @@ jobs: upload_coverage: strategy: + fail-fast: false matrix: os: [ ubuntu-20.04 ] ruby: [ '3.2.2' ] diff --git a/app/assets/stylesheets/components/_address.scss b/app/assets/stylesheets/components/_address.scss index 4450311a0..6bb3ff4e8 100644 --- a/app/assets/stylesheets/components/_address.scss +++ b/app/assets/stylesheets/components/_address.scss @@ -50,11 +50,11 @@ } &:nth-child(2) { - width: 88px; + width: fit-content; } &:nth-child(3) { - width: 88px; + width: fit-content; } &:nth-child(4) { @@ -81,11 +81,11 @@ } &:nth-child(2) { - width: 88px; + width: fit-content; } - + &:nth-child(3) { - width: 88px; + width: fit-content; } } diff --git a/app/assets/stylesheets/components/_footer.scss b/app/assets/stylesheets/components/_footer.scss index aa82f38a1..5280b8c7f 100644 --- a/app/assets/stylesheets/components/_footer.scss +++ b/app/assets/stylesheets/components/_footer.scss @@ -110,7 +110,7 @@ .c-footer__highlight__info, .c-footer__highlight__contact { font-weight: 500; - font-size: rem(16px); + font-size: rem(14px); line-height: rem(22px); text-align: left; color: $white-color; diff --git a/app/assets/stylesheets/components/_modal.scss b/app/assets/stylesheets/components/_modal.scss index d69fed945..43f0b5278 100644 --- a/app/assets/stylesheets/components/_modal.scss +++ b/app/assets/stylesheets/components/_modal.scss @@ -360,6 +360,10 @@ .c-modal__footer__col { display: flex; gap: rem(24px); + .c-btn { + font-size: rem(14px); + cursor: pointer; + } } .c-modal--error { diff --git a/app/assets/stylesheets/components/_table.scss b/app/assets/stylesheets/components/_table.scss index 5e1688a53..6a655e819 100644 --- a/app/assets/stylesheets/components/_table.scss +++ b/app/assets/stylesheets/components/_table.scss @@ -117,7 +117,7 @@ order: 2; @include mq(tablet) { - text-align: center; + text-align: right; order: 0; } } @@ -126,7 +126,7 @@ background: 96% center/16px no-repeat; background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.34779 12.0569C3.39471 12.0569 0.992188 9.58191 0.992188 6.5397C0.992188 3.4975 3.39471 1.02246 6.34779 1.02246C9.30087 1.02246 11.7034 3.4975 11.7034 6.5397C11.7034 9.58191 9.30087 12.0569 6.34779 12.0569ZM6.34779 2.12591C3.98543 2.12591 2.06331 4.10605 2.06331 6.5397C2.06331 8.97336 3.98543 10.9535 6.34779 10.9535C8.71015 10.9535 10.6323 8.97336 10.6323 6.5397C10.6323 4.10605 8.71068 2.12591 6.34779 2.12591Z' fill='%23212224'/%3E%3Cpath d='M14.0037 14.9771C13.9334 14.9772 13.8637 14.9629 13.7988 14.9352C13.7338 14.9075 13.6748 14.8668 13.6251 14.8155L9.5045 10.5705C9.45477 10.5193 9.41533 10.4585 9.38842 10.3915C9.36151 10.3246 9.34766 10.2529 9.34766 10.1804C9.34766 10.108 9.36151 10.0362 9.38842 9.96932C9.41533 9.90239 9.45477 9.84158 9.5045 9.79036C9.55422 9.73913 9.61325 9.6985 9.67822 9.67078C9.74318 9.64305 9.81282 9.62878 9.88314 9.62878C9.95346 9.62878 10.0231 9.64305 10.0881 9.67078C10.153 9.6985 10.2121 9.73913 10.2618 9.79036L14.3824 14.0353C14.4575 14.1124 14.5087 14.2107 14.5295 14.3178C14.5503 14.4249 14.5398 14.5359 14.4992 14.6369C14.4587 14.7378 14.3899 14.824 14.3017 14.8846C14.2135 14.9451 14.1098 14.9774 14.0037 14.9771Z' fill='%23212224'/%3E%3C/svg%3E%0A"); line-height: rem(32px); - height: rem(32px); + height: rem(36px); padding: rem(0 16px); border: 1px solid $grey-200-color; border-radius: rem(16px); diff --git a/app/assets/stylesheets/mixins/_btn.scss b/app/assets/stylesheets/mixins/_btn.scss index 1bb7bc472..32519f76c 100644 --- a/app/assets/stylesheets/mixins/_btn.scss +++ b/app/assets/stylesheets/mixins/_btn.scss @@ -1,6 +1,6 @@ @mixin btn { font-weight: 500; - font-size: rem(16px); + font-size: rem(14px); line-height: rem(32px); text-align: center; display: inline-block; diff --git a/app/assets/stylesheets/objects/_form.scss b/app/assets/stylesheets/objects/_form.scss index 7e78ec836..7a259e945 100644 --- a/app/assets/stylesheets/objects/_form.scss +++ b/app/assets/stylesheets/objects/_form.scss @@ -83,9 +83,9 @@ // Custom Checkbox .o-checkbox { display: inline-block; - height: rem(16px); + height: rem(19px); position: relative; - width: rem(30px); + width: rem(33px); &.u-disabled { opacity: 0.6; @@ -111,11 +111,11 @@ background: $gradient-grey; bottom: 2px; content: ""; - height: rem(12px); + height: rem(15px); left: 2px; position: absolute; transition: .4s; - width: rem(12px); + width: rem(15px); } input:checked + .o-checkbox__slider { diff --git a/app/components/common/footer/component.html.erb b/app/components/common/footer/component.html.erb index 1906d022b..735b3d99e 100644 --- a/app/components/common/footer/component.html.erb +++ b/app/components/common/footer/component.html.erb @@ -5,11 +5,11 @@ <%= render 'svg/footer_eis_logo' %>