From fd0335c61368e95a878ba345740def2615976e63 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 26 Aug 2019 22:54:02 -0400 Subject: [PATCH] fix: login dialog dark mode --- .gitignore | 6 +++--- client/components/login.vue | 2 +- package.json | 4 ++-- yarn.lock | 33 ++++++++++++++++----------------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 3ef2576e..9e37fa62 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,9 @@ npm-debug.log* # Generated assets /assets -/server/views/master.pug -/server/views/legacy/master.pug -/server/views/setup.pug +server/views/master.pug +server/views/legacy/master.pug +server/views/setup.pug # Webpack .webpack-cache diff --git a/client/components/login.vue b/client/components/login.vue index 241e6c5d..a07e2cc2 100644 --- a/client/components/login.vue +++ b/client/components/login.vue @@ -11,7 +11,7 @@ offset-xl4, xl4 ) transition(name='fadeUp') - v-card.elevation-5(v-show='isShown') + v-card.elevation-5(v-show='isShown', light) v-toolbar(color='primary', flat, dense, dark) v-spacer .subheading(v-if='screen === "tfa"') {{ $t('auth:tfa.subtitle') }} diff --git a/package.json b/package.json index 85341d09..4002be40 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "mssql": "5.1.0", "multer": "1.4.2", "mysql2": "1.6.5", - "nanoid": "2.0.3", + "nanoid": "2.0.4", "node-2fa": "1.1.2", "node-cache": "4.2.1", "nodemailer": "6.3.0", @@ -194,7 +194,7 @@ "apollo-link-ws": "1.0.18", "apollo-utilities": "1.3.2", "autoprefixer": "9.6.1", - "babel-eslint": "10.0.2", + "babel-eslint": "10.0.3", "babel-jest": "24.9.0", "babel-loader": "^8.0.6", "babel-plugin-graphql-tag": "2.5.0", diff --git a/yarn.lock b/yarn.lock index 0ddd6407..446fa0ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3146,17 +3146,17 @@ azure-search-types@^1.0.10: dependencies: "@types/geojson" "^7946.0.4" -babel-eslint@10.0.2: - version "10.0.2" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.2.tgz#182d5ac204579ff0881684b040560fdcc1558456" - integrity sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q== +babel-eslint@10.0.3: + version "10.0.3" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a" + integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA== dependencies: "@babel/code-frame" "^7.0.0" "@babel/parser" "^7.0.0" "@babel/traverse" "^7.0.0" "@babel/types" "^7.0.0" - eslint-scope "3.7.1" eslint-visitor-keys "^1.0.0" + resolve "^1.12.0" babel-jest@24.9.0, babel-jest@^24.9.0: version "24.9.0" @@ -5820,14 +5820,6 @@ eslint-plugin-vue@5.2.3: dependencies: vue-eslint-parser "^5.0.0" -eslint-scope@3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" - integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug= - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172" @@ -9846,10 +9838,10 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== -nanoid@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.0.3.tgz#dde999e173bc9d7bd2ee2746b89909ade98e075e" - integrity sha512-NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw== +nanoid@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.0.4.tgz#4889355c9ce8e24efad7c65945a4a2875ac3e8f4" + integrity sha512-sOJnBmY3TJQBVIBqKHoifuwygrocXg3NjS9rZSMnVl05XWSHK7Qxb177AIZQyMDjP86bz+yneozj/h9qsPLcCA== nanomatch@^1.2.9: version "1.2.13" @@ -13195,6 +13187,13 @@ resolve@^1.10.1, resolve@^1.11.0: dependencies: path-parse "^1.0.6" +resolve@^1.12.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== + dependencies: + path-parse "^1.0.6" + resolve@^1.4.0, resolve@^1.8.1: version "1.11.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"