Skip to content

Commit

Permalink
Drop dragonfly css
Browse files Browse the repository at this point in the history
  • Loading branch information
@Levminer
Levminer committed Dec 4, 2021
1 parent 25262f4 commit f4b81e3
Show file tree
Hide file tree
Showing 21 changed files with 534 additions and 296 deletions.
2 changes: 1 addition & 1 deletion app/application/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- js -->
<script defer src="./src/js/index.js"></script>
<!-- css -->
<link rel="stylesheet" href="../.././src/dragonfly.css" />
<link rel="stylesheet" href="../.././src/global.css" />
<link rel="stylesheet" href="../../src/tailwind.css" />
<link rel="stylesheet" href="./src/css/index.css" />
</head>
Expand Down
2 changes: 1 addition & 1 deletion app/confirm/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- js -->
<script defer src="./src/js/index.js"></script>
<!-- css -->
<link rel="stylesheet" href="../.././src/dragonfly.css" />
<link rel="stylesheet" href="../.././src/global.css" />
<link rel="stylesheet" href="../.././src/tailwind.css" />
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion app/edit/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- js -->
<script defer src="./src/js/index.js"></script>
<!-- css -->
<link rel="stylesheet" href="../.././src/dragonfly.css" />
<link rel="stylesheet" href="../.././src/global.css" />
<link rel="stylesheet" href="../.././src/tailwind.css" />
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion app/export/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- js -->
<script defer src="./src/js/index.js"></script>
<!-- css -->
<link rel="stylesheet" href="../.././src/dragonfly.css" />
<link rel="stylesheet" href="../.././src/global.css" />
<link rel="stylesheet" href="../.././src/tailwind.css" />
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion app/import/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<script defer src="./src/js/qr.js"></script>
<script defer src="./src/js/ga.js"></script>
<!-- css -->
<link rel="stylesheet" href="../.././src/dragonfly.css" />
<link rel="stylesheet" href="../.././src/global.css" />
<link rel="stylesheet" href="../../src/tailwind.css" />
<link rel="stylesheet" href="./src/css/index.css" />
</head>
Expand Down
2 changes: 1 addition & 1 deletion app/landing/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline'; img-src 'self' data:" />
<meta charset="UTF-8" />
<!-- css -->
<link rel="stylesheet" href="../.././src/dragonfly.css" />
<link rel="stylesheet" href="../.././src/global.css" />
<link rel="stylesheet" href="../../src/tailwind.css" />
<!-- js -->
<script defer src="./src/js/index.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion app/settings/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<script defer src="./src/js/index.js"></script>
<script defer src="./src/js/shortcuts.js"></script>
<!-- css -->
<link rel="stylesheet" href="../.././src/dragonfly.css" />
<link rel="stylesheet" href="../.././src/global.css" />
<link rel="stylesheet" href="../../src/tailwind.css" />
<link rel="stylesheet" href="./src/css/index.css" />
</head>
Expand Down
2 changes: 1 addition & 1 deletion app/splash/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- js -->
<script defer src="./src/js/index.js"></script>
<!-- css -->
<link rel="stylesheet" href="../.././src/dragonfly.css" />
<link rel="stylesheet" href="../.././src/global.css" />
<link rel="stylesheet" href="../.././src/tailwind.css" />
<link rel="stylesheet" href="./src/css/index.css" />
</head>
Expand Down
196 changes: 196 additions & 0 deletions package-lock.json
View file

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

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
"build:release": "node scripts/release-build.js && electron-builder --publish=never --x64",
"build:alpha": "node scripts/alpha-build.js && electron-builder --publish=never --x64",
"build:test": "node scripts/alpha-build.js && electron-builder --publish=never --x64 --dir -c scripts/test-build.json",
"build:df": "sass src/dragonfly.scss src/dragonfly.css --no-source-map --style compressed",
"build:tw": "tailwindcss build -i src/tailwind.scss -o src/tailwind.css -c .tailwindrc.js --no-autoprefixer --minify",
"watch:df": "sass src/dragonfly.scss src/dragonfly.css --no-source-map --style compressed --watch",
"build:styles": "concurrently 'npm:watch:tw' 'npm:watch:gb'",
"watch:gb": "sass src/global.scss src/global.css --no-source-map --style compressed --watch",
"watch:tw": "tailwindcss build -i src/tailwind.scss -o src/tailwind.css -c .tailwindrc.js --no-autoprefixer --minify --watch",
"lint": "eslint --fix .",
"eslint": "eslint ."
Expand Down Expand Up @@ -97,6 +96,7 @@
"devDependencies": {
"@tailwindcss/forms": "^0.3.4",
"autoprefixer": "^10.4.0",
"concurrently": "^6.4.0",
"electron": "^16.0.4",
"electron-builder": "^22.14.5",
"eslint": "^8.3.0",
Expand Down
1 change: 0 additions & 1 deletion src/dragonfly.css
View file

This file was deleted.

Loading

0 comments on commit f4b81e3

Please sign in to comment.