From 4c96c91cb52b864ce09fccf2819fb7f1eadbe6e5 Mon Sep 17 00:00:00 2001 From: diescake Date: Sat, 6 Jul 2019 03:58:00 +0900 Subject: [PATCH] Set box-sizing: border-box and fix style issues --- src/app/containers/TodoApp/index.tsx | 4 ++-- src/app/containers/TodoApp/style.scss | 10 +++++++++- src/assets/css/common.scss | 7 +++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/app/containers/TodoApp/index.tsx b/src/app/containers/TodoApp/index.tsx index 97867ace9..e52f9d277 100644 --- a/src/app/containers/TodoApp/index.tsx +++ b/src/app/containers/TodoApp/index.tsx @@ -107,7 +107,7 @@ const TodoApp: FC = (props: TodoAppProps) => { {words.todoApp.logout} - diff --git a/src/app/containers/TodoApp/style.scss b/src/app/containers/TodoApp/style.scss index 16a965053..0c9c8fa08 100644 --- a/src/app/containers/TodoApp/style.scss +++ b/src/app/containers/TodoApp/style.scss @@ -9,6 +9,14 @@ font-size: 1rem; } +.logoutButton { + font-size: 1rem; +} + +.addButton { + font-size: 1rem; +} + .inputTodo { width: 70%; margin: 10px 0; @@ -16,6 +24,6 @@ font-size: 2.6rem; } -.addButton { +.postButton { font-size: 2.5rem; } diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss index b1d8ebc13..92a2b8605 100644 --- a/src/assets/css/common.scss +++ b/src/assets/css/common.scss @@ -1,11 +1,18 @@ @import '~@/app/helpers/styleVars'; +*, +*::before, +*::after { + box-sizing: border-box; +} + html { font-size: 62.5%; } body { color: $black_01; + font-size: 1.6rem; } a:link {