Skip to content

Commit f71fc57

Browse files
committed
other: replace scss on css
1 parent 96b98b6 commit f71fc57

83 files changed

Lines changed: 7427 additions & 29259 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

config/webpack.config.renderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
33
const path = require("path");
44

55
const rootFolder = process.cwd();
6-
const resolveExtensions = [".ts", ".tsx", ".js", ".jsx", ".json", ".scss"];
6+
const resolveExtensions = [".ts", ".tsx", ".js", ".jsx", ".json", ".css"];
77
const resolveModules = ["node_modules", "react"];
88

99
module.exports = config => {

package-lock.json

Lines changed: 6362 additions & 28088 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@
5757
"@types/node": "^12.12.13",
5858
"@types/react": "^16.14.2",
5959
"@types/react-dom": "^16.0.10",
60-
"@types/react-redux": "^5.0.15",
6160
"@types/react-router-dom": "^4.3.1",
62-
"@types/redux": "^3.6.0",
6361
"@types/uuid": "^8.3.0",
6462
"@typescript-eslint/eslint-plugin": "^4.1.1",
6563
"@typescript-eslint/parser": "^4.1.1",
@@ -81,9 +79,7 @@
8179
"lint-staged": "^10.5.3",
8280
"native-ext-loader": "^2.3.0",
8381
"node-loader": "^1.0.2",
84-
"node-sass": "^4.14.1",
8582
"prettier": "^1.19.1",
86-
"sass-loader": "^10.0.2",
8783
"style-loader": "^1.2.1",
8884
"ts-loader": "^8.0.3",
8985
"typescript": "^3.7.5",

src/renderer/colors.css

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
root {
2+
--white_1: #fff;
3+
4+
--black_1: #050505;
5+
--black_2: #333333;
6+
--black_3: #222222;
7+
8+
--llgray_1: #F2F2F2;
9+
--lgray_1: #D1D1D1;
10+
--lgray_2: #828282;
11+
--gray_1: #2c2c2c;
12+
--gray_2: #444444;
13+
14+
--blue_1: #30C2FF;
15+
--blue_2: #d8f3ffff;
16+
17+
--red_1: #e81123;
18+
19+
--second_text_color: #B3B3B3;
20+
}

src/renderer/colors.scss

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/renderer/components/Header/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from "react";
22

33
import { Text, Button, Icon } from "Elements";
44

5-
import "./style.scss";
5+
import "./style.css";
66

77
interface HeaderProps {
88
text: string;
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
.header {
2+
display: grid;
3+
grid-template-columns: 1fr 50px 20px;
4+
justify-content: space-between;
5+
background-color: var(--bg-header);
6+
padding: 10px 14px 10px 30px;
7+
align-items: center;
8+
height: 30px;
9+
}
10+
.header__text {
11+
padding: 0;
12+
margin: 0;
13+
color: var(--fg-header);
14+
fill: var(--fg-header);
15+
}
16+
.header__additional {
17+
display: flex;
18+
}
19+
.header__close {
20+
color: var(--fg-header-control);
21+
fill: var(--fg-header-control);
22+
}

src/renderer/components/Header/style.scss

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/renderer/components/Settings/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as E from "electron";
22
import * as React from "react";
33
import { observer, inject } from "mobx-react";
44

5-
import "./style.scss";
5+
import "./style.css";
66
import { Text, Button, Icon } from "Elements";
77
import Header from "../Header";
88
import General from "./views/General";

0 commit comments

Comments
 (0)