Skip to content

Commit

Permalink
version 2 -- improved look
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaorongw committed Jun 17, 2020
1 parent 774bac7 commit 2670fda
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 225 deletions.
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@
"@fortawesome/free-regular-svg-icons": "^5.13.0",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@fortawesome/react-fontawesome": "^0.1.10",
"@material-ui/core": "^4.10.2",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"bootstrap": "^4.5.0",
"fontsource-roboto": "^2.1.4",
"moment": "^2.26.0",
"react": "^16.13.1",
"react-dates": "^21.8.0",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
content="Task taker, your to-do application"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
Expand Down
12 changes: 4 additions & 8 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@ h1, h2, h3 {
margin-top: 15px;
}

/* .task-input {
transition: all 1s ease-in;
} */

.task-input:hover {
/* .task-input:hover {
transform: scale(1.01);
}
} */

span.today-date {
padding-left: 10px;
Expand Down Expand Up @@ -116,10 +112,10 @@ span.today-date {

.today-img {
width: 70px;
margin-right: 10px;
/* margin-right: 10px; */
}

.addtask-img {
width: 25px;
width: 22px;
margin-right: 10px;
}
6 changes: 1 addition & 5 deletions src/components/TodoInputComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,8 @@ class TodoInput extends Component {
</div>
</Form>
</div>

</div>
</div>



</div>
</Card>
</div>
</div>
Expand Down
9 changes: 7 additions & 2 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
@import url('https://fonts.googleapis.com/css2?family=Gaegu:wght@700&display=swap');


body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
/* font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
sans-serif; */
font-family: 'Gaegu', cursive;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 18px;

background-color:rgb(235, 236, 231);
}
1 change: 0 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'bootstrap/dist/css/bootstrap.min.css';
import 'react-dates/lib/css/_datepicker.css';
import App from './App';
import * as serviceWorker from './serviceWorker';
import 'fontsource-roboto';
import './index.css';

ReactDOM.render(
Expand Down
Loading

0 comments on commit 2670fda

Please sign in to comment.