From 1ea6261a61dc8f91da3f937ecfc885ad3703e8ac Mon Sep 17 00:00:00 2001 From: tiramisu_oTATo Date: Fri, 29 Sep 2023 04:39:21 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=A9=E3=82=AF?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E7=94=BB=E5=83=8F=E3=81=AE=E4=B8=8B=E5=81=B4?= =?UTF-8?q?=E3=81=8C=E5=88=87=E3=82=8C=E3=81=A6=E3=82=8B=E6=84=9F=E3=81=98?= =?UTF-8?q?=E3=82=92=E3=81=AA=E3=81=8F=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dormitoryCharacterCard.tsx | 5 ++++- src/components/layout.scss | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/dormitoryCharacterCard.tsx b/src/components/dormitoryCharacterCard.tsx index a11078fb3..26e420534 100644 --- a/src/components/dormitoryCharacterCard.tsx +++ b/src/components/dormitoryCharacterCard.tsx @@ -31,7 +31,10 @@ export default ({ alt={characterInfo.name} objectFit="contain" /> -
+

{characterInfo.name}

diff --git a/src/components/layout.scss b/src/components/layout.scss index f9b36fb3d..967cd7b8b 100644 --- a/src/components/layout.scss +++ b/src/components/layout.scss @@ -523,6 +523,7 @@ $dropdown-item-active-background-color: $primary; .card-content { @extend .px-0; @extend .has-text-centered; + border-top: solid 3px; } } From c9d211433d3197d1680aa5e43360fedec033caed Mon Sep 17 00:00:00 2001 From: tiramisu_oTATo Date: Fri, 29 Sep 2023 04:40:00 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=A9=E3=82=AF?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AE=E9=96=93?= =?UTF-8?q?=E3=82=84=E6=B0=B4=E5=B9=B3=E7=B7=9A=E3=81=A8=E3=81=AE=E4=BD=99?= =?UTF-8?q?=E7=99=BD=E3=82=92=E5=9D=87=E7=AD=89=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout.scss | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/layout.scss b/src/components/layout.scss index 967cd7b8b..9220a6c96 100644 --- a/src/components/layout.scss +++ b/src/components/layout.scss @@ -484,6 +484,10 @@ $dropdown-item-active-background-color: $primary; background-color: white; &.character-container { + .columns:not(:last-child) { + margin-bottom: -0.75rem; + } + .generation-label { @extend .has-text-centered; display: flex; @@ -495,6 +499,11 @@ $dropdown-item-active-background-color: $primary; } } + .jump-anchor-header-padding { + // カード間の余白を均等にする + padding-top: calc(3.25rem + 1rem + 0.75rem); + } + .card { box-shadow: none; border-style: solid; @@ -503,6 +512,7 @@ $dropdown-item-active-background-color: $primary; } .character-card { + @extend .pt-5; cursor: pointer; .card-image { @@ -512,6 +522,7 @@ $dropdown-item-active-background-color: $primary; .card-content { @extend .px-0; @extend .has-text-centered; + border-top: solid 3px; } } @@ -523,7 +534,6 @@ $dropdown-item-active-background-color: $primary; .card-content { @extend .px-0; @extend .has-text-centered; - border-top: solid 3px; } } From ae1a6b1fd5563c4d537b1d1b2a47a46b47a919fa Mon Sep 17 00:00:00 2001 From: tiramisu_oTATo Date: Fri, 29 Sep 2023 05:15:33 +0900 Subject: [PATCH 3/4] =?UTF-8?q?7=E6=9C=9F=E7=94=9F=E3=81=AE=E4=B8=8A?= =?UTF-8?q?=E3=81=AB=E6=B0=B4=E5=B9=B3=E7=B7=9A=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/dormitory.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/dormitory.tsx b/src/pages/dormitory.tsx index 1c5a13b25..f25f06d59 100644 --- a/src/pages/dormitory.tsx +++ b/src/pages/dormitory.tsx @@ -59,6 +59,8 @@ const Dormitory: React.FC = ({ setShowingHeader }) => {
+
+
Date: Sat, 30 Sep 2023 03:36:36 +0900 Subject: [PATCH 4/4] Apply suggestions from code review --- src/components/layout.scss | 8 ++++---- src/pages/dormitory.tsx | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/layout.scss b/src/components/layout.scss index 9220a6c96..8a0240cbe 100644 --- a/src/components/layout.scss +++ b/src/components/layout.scss @@ -485,7 +485,7 @@ $dropdown-item-active-background-color: $primary; &.character-container { .columns:not(:last-child) { - margin-bottom: -0.75rem; + margin-bottom: -0.75rem; // columnsは下方向のmargin調整がないので、hrの辻褄を合わせに必要 } .generation-label { @@ -501,7 +501,7 @@ $dropdown-item-active-background-color: $primary; .jump-anchor-header-padding { // カード間の余白を均等にする - padding-top: calc(3.25rem + 1rem + 0.75rem); + padding-top: calc(3.25rem + 1rem + 0.75rem); // 元が3.25rem + 1rem、column分が0.75rem } .card { @@ -512,7 +512,7 @@ $dropdown-item-active-background-color: $primary; } .character-card { - @extend .pt-5; + @extend .pt-3; cursor: pointer; .card-image { @@ -522,7 +522,7 @@ $dropdown-item-active-background-color: $primary; .card-content { @extend .px-0; @extend .has-text-centered; - border-top: solid 3px; + border-top: solid 2.5px; } } diff --git a/src/pages/dormitory.tsx b/src/pages/dormitory.tsx index f25f06d59..1c5a13b25 100644 --- a/src/pages/dormitory.tsx +++ b/src/pages/dormitory.tsx @@ -59,8 +59,6 @@ const Dormitory: React.FC = ({ setShowingHeader }) => {
-
-