Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Commit

Permalink
Set box-sizing: border-box and fix style issues
Browse files Browse the repository at this point in the history
  • Loading branch information
diescake committed Jul 5, 2019
1 parent d10a33f commit 4c96c91
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/app/containers/TodoApp/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const TodoApp: FC<TodoAppProps> = (props: TodoAppProps) => {
{words.todoApp.logout}
</button>
</div>
<button type="button" onClick={modalOpen}>
<button type="button" className={style.addButton} onClick={modalOpen}>
{words.todoApp.newTodo}
</button>
<Modal hidden={modalHidden} name={words.todoApp.newTodo} close={modalClose}>
Expand All @@ -119,7 +119,7 @@ const TodoApp: FC<TodoAppProps> = (props: TodoAppProps) => {
placeholder={words.todoApp.placeholder}
value={text}
/>
<button type="button" className={style.addButton} disabled={props.fetching} onClick={handleAddTodoClick}>
<button type="button" className={style.postButton} disabled={props.fetching} onClick={handleAddTodoClick}>
{words.todoApp.addTodo}
</button>
</Modal>
Expand Down
10 changes: 9 additions & 1 deletion src/app/containers/TodoApp/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,21 @@
font-size: 1rem;
}

.logoutButton {
font-size: 1rem;
}

.addButton {
font-size: 1rem;
}

.inputTodo {
width: 70%;
margin: 10px 0;
padding: 0 10px;
font-size: 2.6rem;
}

.addButton {
.postButton {
font-size: 2.5rem;
}
7 changes: 7 additions & 0 deletions src/assets/css/common.scss
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down

0 comments on commit 4c96c91

Please sign in to comment.