From 6748893354c4e935d1dff890ee0dae04cf4cd279 Mon Sep 17 00:00:00 2001 From: kitsne Date: Sun, 15 Dec 2024 14:36:19 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E8=A6=8B=E3=81=9F=E7=9B=AE=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 1 + src/assets/service_icons/github.svg | 5 +++ src/assets/service_icons/google.svg | 10 +++++ src/assets/service_icons/traq.svg | 10 +++++ src/views/LoginView.vue | 60 +++++++++++++++++++++++++++-- tailwind.config.js | 33 ++++++++++------ 6 files changed, 104 insertions(+), 15 deletions(-) create mode 100644 src/assets/service_icons/github.svg create mode 100644 src/assets/service_icons/google.svg create mode 100644 src/assets/service_icons/traq.svg diff --git a/index.html b/index.html index be5747a..82d3a55 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,7 @@ + Vite App diff --git a/src/assets/service_icons/github.svg b/src/assets/service_icons/github.svg new file mode 100644 index 0000000..9583c73 --- /dev/null +++ b/src/assets/service_icons/github.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/assets/service_icons/google.svg b/src/assets/service_icons/google.svg new file mode 100644 index 0000000..7968a80 --- /dev/null +++ b/src/assets/service_icons/google.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/service_icons/traq.svg b/src/assets/service_icons/traq.svg new file mode 100644 index 0000000..d3398c3 --- /dev/null +++ b/src/assets/service_icons/traq.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 223f1f5..a15c61f 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -1,9 +1,61 @@ - + - + diff --git a/tailwind.config.js b/tailwind.config.js index a3226d3..d733b5f 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -17,22 +17,33 @@ export default { 'text-tertiary': '#9a9a9a', 'text-inv-primary': '#f0f0f0', 'status-error': '#e02a2a', - 'red': '#ff0000', - 'white': '#ffffff', + red: '#ff0000', + white: '#ffffff' }, fontFamily: { - primary: ['Open Sans', 'Noto Sans JP', 'sans-serif'] + primary: ['Noto Sans JP', 'Open Sans', 'sans-serif'] }, extend: { spacing: { - '1.625': '0.40625rem', - '1.75': '0.4375rem', - '4.5': '1.125rem', - '7.5': '1.875rem', - '11.5': '2.875rem', - '27': '6.75rem', - '50': '12.5rem', - '62.5': '15.625rem' + 1.625: '0.40625rem', + 1.75: '0.4375rem', + 4.5: '1.125rem', + 7.5: '1.875rem', + 11.5: '2.875rem', + 27: '6.75rem', + 37: '9.25rem', + 50: '12.5rem', + 58: '14.5rem', + 62.5: '15.625rem', + 82: '20.5rem', + 78: '19.5rem', + 172: '43rem', + 200: '50rem' + }, + fontSize: { + '12px': '12px', + '14px': '14px', + '28px': '28px' } } }, From 7e32f2cad53233e57ad65861ca221633c8fb78a2 Mon Sep 17 00:00:00 2001 From: kitsne241 Date: Fri, 20 Dec 2024 08:57:10 +0900 Subject: [PATCH 2/5] =?UTF-8?q?`p`=E3=82=92`span`=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B+=E5=85=A5=E5=8A=9B=E3=82=B3=E3=83=B3=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/LoginView.vue | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index a15c61f..5d14bc2 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -1,6 +1,8 @@ - + From b2b9f3ccbe8ca10ba9ba2cadf7adcb3c3b53f8a0 Mon Sep 17 00:00:00 2001 From: kitsne241 Date: Fri, 20 Dec 2024 09:07:51 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB=E3=81=AE=E9=81=A9=E7=94=A8?= =?UTF-8?q?=E3=81=A8main.css=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/main.css | 2 +- src/views/LoginView.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assets/main.css b/src/assets/main.css index e349ba2..d6148a8 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -64,7 +64,7 @@ line-height: 1rem; } -.fontstyle-ui-caption { +.fontstyle-ui-caption-strong { @apply font-primary; font-size: 0.75rem; font-style: normal; diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 2f80b66..3057e3e 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -11,26 +11,26 @@ import PasswordTextbox from '@/components/Controls/Textbox/PasswordTextbox.vue' class="flex items-center justify-center bg-background-secondary" >
-

ログイン

+

ログイン

@@ -41,7 +41,7 @@ import PasswordTextbox from '@/components/Controls/Textbox/PasswordTextbox.vue'
- + パスワードを忘れた場合
From 84afbd35d3af2c7a38a2470c1766a7535160dbcd Mon Sep 17 00:00:00 2001 From: kitsne241 Date: Fri, 20 Dec 2024 09:09:56 +0900 Subject: [PATCH 5/5] =?UTF-8?q?tailwind.config.js=E3=81=AE=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/LoginView.vue | 4 ++-- tailwind.config.js | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 3057e3e..1f09691 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -42,8 +42,8 @@ import PasswordTextbox from '@/components/Controls/Textbox/PasswordTextbox.vue' - パスワードを忘れた場合 + パスワードを忘れた場合 + diff --git a/tailwind.config.js b/tailwind.config.js index d733b5f..0ed0d27 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -21,7 +21,7 @@ export default { white: '#ffffff' }, fontFamily: { - primary: ['Noto Sans JP', 'Open Sans', 'sans-serif'] + primary: ['Open Sans', 'Noto Sans JP', 'sans-serif'] }, extend: { spacing: { @@ -39,11 +39,6 @@ export default { 78: '19.5rem', 172: '43rem', 200: '50rem' - }, - fontSize: { - '12px': '12px', - '14px': '14px', - '28px': '28px' } } },