From 6ace752c72d04de4f7499762c266e6d60c20b593 Mon Sep 17 00:00:00 2001 From: PrestonN Date: Fri, 1 Oct 2021 16:06:57 -0400 Subject: [PATCH 1/2] Update Electron to fix cert issue --- .mergepal.yml | 5 ----- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 .mergepal.yml diff --git a/.mergepal.yml b/.mergepal.yml deleted file mode 100644 index 2418eaa0..00000000 --- a/.mergepal.yml +++ /dev/null @@ -1,5 +0,0 @@ -whitelist: -blacklist: - - wip - - do-not-merge -method: squash diff --git a/package.json b/package.json index 67a549ec..b11664ed 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "babel-loader": "^8.2.2", "copy-webpack-plugin": "^9.0.1", "css-loader": "5.2.6", - "electron": "^13.3.0", + "electron": "^13.5.1", "electron-builder": "^22.11.7", "electron-builder-squirrel-windows": "^22.13.1", "electron-debug": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 5dcd98a8..8276f752 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3543,10 +3543,10 @@ electron-to-chromium@^1.3.830: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz#823cb9c98f28c64c673920f1c90ea3826596eaf9" integrity sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg== -electron@^13.3.0: - version "13.3.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.3.0.tgz#5f4f245723dd50fcd2c3d386a1d66fe748af404f" - integrity sha512-d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA== +electron@^13.5.1: + version "13.5.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.5.1.tgz#76c02c39be228532f886a170b472cbd3d93f0d0f" + integrity sha512-ZyxhIhmdaeE3xiIGObf0zqEyCyuIDqZQBv9NKX8w5FNzGm87j4qR0H1+GQg6vz+cA1Nnv1x175Zvimzc0/UwEQ== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" From 523a28d0f757807fe09aefdf4a30bb48cb3a4fe2 Mon Sep 17 00:00:00 2001 From: PrestonN Date: Tue, 12 Oct 2021 16:19:46 -0400 Subject: [PATCH 2/2] Fix text color contrast with main Dracula colors --- src/renderer/components/side-nav/side-nav.css | 2 +- src/renderer/themes.css | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/renderer/components/side-nav/side-nav.css b/src/renderer/components/side-nav/side-nav.css index d71079f3..81978321 100644 --- a/src/renderer/components/side-nav/side-nav.css +++ b/src/renderer/components/side-nav/side-nav.css @@ -6,7 +6,7 @@ position: fixed; left: 0px; top: 0px; - z-index: 1; + z-index: 4; margin-top: 60px; box-shadow: 1px -1px 1px -1px var(--primary-shadow-color); background-color: var(--side-nav-color); diff --git a/src/renderer/themes.css b/src/renderer/themes.css index 4e61c67f..73e365fb 100644 --- a/src/renderer/themes.css +++ b/src/renderer/themes.css @@ -287,7 +287,7 @@ --primary-color: #FF79C6; --primary-color-hover: #FF86CC; --primary-color-active: #E66DB2; - --text-with-main-color: #282A36; + --text-with-main-color: #F8F8F2; --logo-icon-bar-color: url("~../../_icons/iconDraculaLightSmall.png"); --logo-text-bar-color: url("~../../_icons/textDraculaLightSmall.png"); } @@ -296,7 +296,7 @@ --primary-color: #BD93F9; --primary-color-hover: #C49EFA; --primary-color-active: #AA84E0; - --text-with-main-color: #282A36; + --text-with-main-color: #F8F8F2; --logo-icon-bar-color: url("~../../_icons/iconDraculaLightSmall.png"); --logo-text-bar-color: url("~../../_icons/textDraculaLightSmall.png"); } @@ -305,7 +305,7 @@ --primary-color: #FF5555; --primary-color-hover: #FF6666; --primary-color-active: #E64D4D; - --text-with-main-color: #282A36; + --text-with-main-color: #F8F8F2; --logo-icon-bar-color: url("~../../_icons/iconDraculaLightSmall.png"); --logo-text-bar-color: url("~../../_icons/textDraculaLightSmall.png"); } @@ -572,7 +572,7 @@ --accent-color-active: #E66DB2; --accent-color-light: #FF94D1; --accent-color-visited: #CC619E; - --text-with-accent-color: #212121; + --text-with-accent-color: #F8F8F2; --accent-color-opacity1: rgba(98,114,164,0.04); --accent-color-opacity2: rgba(98,114,164,0.12); --accent-color-opacity3: rgba(98,114,164,0.16); @@ -585,7 +585,7 @@ --accent-color-active: #AA84E0; --accent-color-light: #CAA9FA; --accent-color-visited: #9776C7; - --text-with-accent-color: #212121; + --text-with-accent-color: #F8F8F2; --accent-color-opacity1: rgba(98,114,164,0.04); --accent-color-opacity2: rgba(98,114,164,0.12); --accent-color-opacity3: rgba(98,114,164,0.16); @@ -598,7 +598,7 @@ --accent-color-active: #E64D4D; --accent-color-light: #FF7777; --accent-color-visited: #CC4444; - --text-with-accent-color: #212121; + --text-with-accent-color: #F8F8F2; --accent-color-opacity1: rgba(98,114,164,0.04); --accent-color-opacity2: rgba(98,114,164,0.12); --accent-color-opacity3: rgba(98,114,164,0.16);