Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Trinovantes committed Sep 27, 2024
1 parent 8e47d42 commit e30432d
Show file tree
Hide file tree
Showing 5 changed files with 540 additions and 533 deletions.
4 changes: 2 additions & 2 deletions build/weback.config.electron.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ export const rendererConfig = merge(commonConfig, {
options: {
additionalData: (content: string, loaderContext: { resourcePath: string }): string => {
return (loaderContext.resourcePath.endsWith('sass'))
? '@use "sass:math"\n @import "@/renderer/client/assets/css/variables.scss"\n' + content
: '@use "sass:math"; @import "@/renderer/client/assets/css/variables.scss"; ' + content
? '@use "sass:color"\n@use "sass:math"\n@import "@/renderer/client/assets/css/variables.scss"\n' + content
: '@use "sass:color"; @use "sass:math"; @import "@/renderer/client/assets/css/variables.scss"; ' + content
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"cross-env": "^7.0.3",
"csp-html-webpack-plugin": "^5.1.0",
"css-loader": "^7.1.2",
"date-fns": "^3.2.0",
"date-fns": "^4.1.0",
"dotenv": "^16.0.3",
"drizzle-orm": "^0.33.0",
"electron": "^32.0.2",
Expand All @@ -65,8 +65,8 @@
"quasar-unused-plugin": "^0.3.4",
"responsive-loader": "^3.0.4",
"sass": "^1.26.11",
"sass-loader": "^16.0.0",
"sharp": "0.32",
"sass-loader": "^16.0.2",
"sharp": "^0.33.5",
"source-map-support": "^0.5.21",
"ts-node": "^10.9.2",
"typescript": "^5.0.2",
Expand Down
10 changes: 5 additions & 5 deletions src/renderer/client/assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
--q-dark-page: #{$dark-page};

--star-3: #{$star3};
--star-3-dark: #{darken($star3, 30%)};
--star-3-dark: #{color.adjust($star3, $lightness: -30%)};
--star-4: #{$star4};
--star-4-dark: #{darken($star4, 30%)};
--star-4-dark: #{color.adjust($star4, $lightness: -30%)};
--star-5: #{$star5};
--star-5-dark: #{darken($star5, 30%)};
--star-5-dark: #{color.adjust($star5, $lightness: -30%)};
}

h1{
Expand Down Expand Up @@ -143,12 +143,12 @@ li{

&.warning{
border-left-color: $warning;
background-color: lighten($warning, 30%);
background-color: color.adjust($warning, $lightness: 30%);
}

&.positive{
border-left-color: $positive;
background-color: lighten($positive, 50%);
background-color: color.adjust($positive, $lightness: 50%);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/renderer/client/assets/css/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ $dark : #1B1B26;
$dark-page : #2C2B36;

$dark-1 : #222;
$dark-2 : lighten($dark, 5%);
$dark-3 : lighten($dark, 10%);
$dark-2 : color.adjust($dark, $lightness: 5%);
$dark-3 : color.adjust($dark, $lightness: 10%);

$primary : $star5;
$secondary : lighten($primary, 20%);
$accent : darken($primary, 10%);
$secondary : color.adjust($primary, $lightness: 20%);
$accent : color.adjust($primary, $lightness: -10%);

$positive : #039725;
$negative : #ff3737;
Expand Down
Loading

0 comments on commit e30432d

Please sign in to comment.