Skip to content

Commit

Permalink
styles fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
RUBIC0N5545 committed Jan 3, 2025
1 parent c105729 commit 5381a7d
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 17 deletions.
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
},
"devDependencies": {
"@cypress/react18": "^2.0.1",
"@mate-academy/scripts": "^1.8.5",
"@mate-academy/scripts": "^1.9.12",
"@mate-academy/students-ts-config": "*",
"@mate-academy/stylelint-config": "*",
"@types/node": "^20.14.10",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-dom": "^18.3.5",
"@typescript-eslint/parser": "^7.16.0",
"@vitejs/plugin-react": "^4.3.1",
"cypress": "^13.13.0",
Expand Down
6 changes: 3 additions & 3 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createRoot } from 'react-dom/client';

import './styles/index.css';
import './styles/todo-list.css';
import './styles/filters.css';
import './styles/index.scss';
import './styles/todo-list.scss';
import './styles/filters.scss';

import { App } from './App';

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/styles/index.css → src/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ body {
}

@import './todoapp';
@import './todo';
@import './filter';
@import './todo-list';
@import './filters';
1 change: 1 addition & 0 deletions src/styles/todo-list.css → src/styles/todo-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
&__title-field {
width: 100%;
padding: 11px 14px;
box-sizing: border-box;

font-size: inherit;
line-height: inherit;
Expand Down
2 changes: 2 additions & 0 deletions src/styles/todoapp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
width: 100%;
padding: 16px 16px 16px 60px;

box-sizing: border-box;

font-size: 24px;
line-height: 1.4em;
font-family: inherit;
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
],
"compilerOptions": {
"sourceMap": false,
"esModuleInterop": true,
"types": ["node", "cypress"]
}
}

0 comments on commit 5381a7d

Please sign in to comment.