Skip to content

Commit 3fbd092

Browse files
authored
Merge pull request #7 from tanhongit/main
Format config
2 parents a044420 + 4caa2f3 commit 3fbd092

File tree

9 files changed

+68
-62
lines changed

9 files changed

+68
-62
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ ij_php_concat_spaces = true
1919
ij_php_phpdoc_param_spaces_between_name_and_description = 1
2020
ij_php_phpdoc_param_spaces_between_tag_and_type = 1
2121
ij_php_phpdoc_param_spaces_between_type_and_name = 1
22+
23+
[*.scss]
24+
indent_style = space
25+
indent_size = 4

.stylelintrc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
{
2-
"ignoreFiles": [
3-
"src/style/scss/material-dashboard/_utilities.scss"
4-
],
52
"rules": {
6-
"indentation": 2,
3+
"indentation": 4,
74
"max-empty-lines": 2,
85
"comment-empty-line-before": null,
96
"rule-empty-line-before": null,
107
"no-descending-specificity": null,
118
"no-eol-whitespace": null
129
}
13-
}
10+
}

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@
2525
],
2626
"support": {
2727
"issues": "https://github.com/cslant/git-notifier-ui/issues"
28-
}
28+
},
29+
"minimum-stability": "dev",
30+
"prefer-stable": true
2931
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "cslant/git-notifier-ui",
2+
"name": "git-notifier-ui",
33
"description": "UI for Git Notifier Packages",
44
"homepage": "https://github.com/cslant/git-notifier-ui",
55
"license": "MIT",

src/scss/_font.scss

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,64 @@
11
@font-face {
2-
font-family: 'Inter';
3-
font-style: normal;
4-
font-weight: 100;
5-
src: url('fonts/Inter-Thin.ttf') format('truetype');
2+
font-family: 'Inter';
3+
font-style: normal;
4+
font-weight: 100;
5+
src: url('fonts/Inter-Thin.ttf') format('truetype');
66
}
7+
78
@font-face {
8-
font-family: 'Inter';
9-
font-style: normal;
10-
font-weight: 200;
11-
src: url('fonts/Inter-ExtraLight.ttf') format('truetype');
9+
font-family: 'Inter';
10+
font-style: normal;
11+
font-weight: 200;
12+
src: url('fonts/Inter-ExtraLight.ttf') format('truetype');
1213
}
14+
1315
@font-face {
14-
font-family: 'Inter';
15-
font-style: normal;
16-
font-weight: 300;
17-
src: url('fonts/Inter-Light.ttf') format('truetype');
16+
font-family: 'Inter';
17+
font-style: normal;
18+
font-weight: 300;
19+
src: url('fonts/Inter-Light.ttf') format('truetype');
1820
}
21+
1922
@font-face {
20-
font-family: 'Inter';
21-
font-style: normal;
22-
font-weight: 400;
23-
src: url('fonts/Inter-Regular.ttf') format('truetype');
23+
font-family: 'Inter';
24+
font-style: normal;
25+
font-weight: 400;
26+
src: url('fonts/Inter-Regular.ttf') format('truetype');
2427
}
2528

2629
@font-face {
27-
font-family: 'Inter';
28-
font-style: normal;
29-
font-weight: 500;
30-
src: url('fonts/Inter-Medium.ttf') format('truetype');
30+
font-family: 'Inter';
31+
font-style: normal;
32+
font-weight: 500;
33+
src: url('fonts/Inter-Medium.ttf') format('truetype');
3134
}
35+
3236
@font-face {
33-
font-family: 'Inter';
34-
font-style: normal;
35-
font-weight: 600;
36-
src: url('fonts/Inter-SemiBold.ttf') format('truetype');
37+
font-family: 'Inter';
38+
font-style: normal;
39+
font-weight: 600;
40+
src: url('fonts/Inter-SemiBold.ttf') format('truetype');
3741
}
42+
3843
@font-face {
39-
font-family: 'Inter';
40-
font-style: normal;
41-
font-weight: 700;
42-
src: url('fonts/Inter-Bold.ttf') format('truetype');
44+
font-family: 'Inter';
45+
font-style: normal;
46+
font-weight: 700;
47+
src: url('fonts/Inter-Bold.ttf') format('truetype');
4348
}
49+
4450
@font-face {
45-
font-family: 'Inter';
46-
font-style: normal;
47-
font-weight: 800;
48-
src: url('fonts/Inter-ExtraBold.ttf') format('truetype');
51+
font-family: 'Inter';
52+
font-style: normal;
53+
font-weight: 800;
54+
src: url('fonts/Inter-ExtraBold.ttf') format('truetype');
4955
}
56+
5057
@font-face {
51-
font-family: 'Inter';
52-
font-style: normal;
53-
font-weight: 900;
54-
src: url('fonts/Inter-Black.ttf') format('truetype');
58+
font-family: 'Inter';
59+
font-style: normal;
60+
font-weight: 900;
61+
src: url('fonts/Inter-Black.ttf') format('truetype');
5562
}
63+
5664
// Define font variables

src/scss/_module.scss

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ body {
1313
font-family: $font-primary;
1414
}
1515

16-
1716
.git-notifier {
1817

1918
// sidebar
@@ -28,7 +27,6 @@ body {
2827
border-radius: 8px;
2928

3029

31-
3230
&-head {
3331
display: flex;
3432
justify-content: center;
@@ -55,6 +53,7 @@ body {
5553
margin: 25px 5px;
5654
padding: 10px 35px;
5755
cursor: pointer;
56+
5857
&:hover {
5958
border-radius: 5px;
6059
background-color: $primary_color;
@@ -138,13 +137,13 @@ body {
138137
text-align: right;
139138
}
140139

141-
#toggleSystemMode:checked+#switch #circle {
140+
#toggleSystemMode:checked + #switch #circle {
142141
left: 38px;
143142
}
144143

145-
#toggleSystemMode:checked+#switch {
144+
#toggleSystemMode:checked + #switch {
146145
background: $light_mode;
147146
}
148147
}
149148
}
150-
}
149+
}

src/scss/_variables.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ $font-primary: 'Inter', sans-serif;
1414
// shadow
1515
$box_shadow: -1px -1px 20px 0px rgba(0, 0, 0, 0.10);
1616

17-
1817
// system
1918
$dark_mode: #0D1117;
20-
$light_mode: #f1a10c;
19+
$light_mode: #f1a10c;

tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
"target": "es5",
77
"allowJs": true
88
},
9-
"files": ["src/index.ts"]
9+
"files": [
10+
"src/index.ts"
11+
]
1012
}

webpack.config.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ const path = require('path');
44
const HtmlWebpackPlugin = require('html-webpack-plugin');
55
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
66

7-
const isProduction = process.env.NODE_ENV == 'production';
8-
7+
const isProduction = process.env.NODE_ENV === 'production';
98

109
const stylesHandler = MiniCssExtractPlugin.loader;
1110

12-
1311
let htmlPageNames = ['example1'];
1412
let multipleHtmlPlugins = htmlPageNames.map(name => {
15-
return new HtmlWebpackPlugin({
16-
template: `html/${name}.html`, // relative path to the HTML files
17-
filename: `${name}.html`, // output HTML files
18-
chunks: [`${name}`] // respective JS files
19-
})
13+
return new HtmlWebpackPlugin({
14+
template: `html/${name}.html`, // relative path to the HTML files
15+
filename: `${name}.html`, // output HTML files
16+
chunks: [`${name}`] // respective JS files
17+
})
2018
});
2119

2220
const config = {
@@ -56,7 +54,6 @@ const config = {
5654
test: /\.(eot|svg|ttf|woff|woff2|png|jpg|gif)$/i,
5755
type: 'asset',
5856
},
59-
6057

6158
// Add your rules for custom modules here
6259
// Learn more about loaders from https://webpack.js.org/loaders/
@@ -70,8 +67,6 @@ const config = {
7067
module.exports = () => {
7168
if (isProduction) {
7269
config.mode = 'production';
73-
74-
7570
} else {
7671
config.mode = 'development';
7772
}

0 commit comments

Comments
 (0)