Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dark version styles #10

Merged
merged 2 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions assets/css/dark.styl
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ html[dark^='true']
.AppCard
background: lighten($black, 2%)
color: $white
box-shadow: $box-shadow
box-shadow: $boxShadow

&.is-clean
color: $white
color: $white !important

&-title
.icon
Expand All @@ -42,10 +42,10 @@ html[dark^='true']
.AppItem
background: lighten($black, 2%)
color: $white
box-shadow: $box-shadow
box-shadow: $boxShadow

&:hover
box-shadow: $box-shadow2
box-shadow: $boxShadow-2

// Table
.table
Expand Down Expand Up @@ -224,4 +224,8 @@ html[dark^='true']
border-color: alpha($white, 0.2)

&.ql-container
border-color: alpha($white, 0.2)
border-color: alpha($white, 0.2)

.button.is-clean
color: $white
fill: $white
4 changes: 2 additions & 2 deletions components/AppCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
$text = isLight(color) ? $black : $white

&.is-{color}
background: $accent
color: $text
background: $accent !important
color: $text !important
border-color: alpha($text, 0.1)

.AppCard
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
"@blexar/framework": "0.0.33",
"@nuxtjs/pwa": "^3.0.0-beta.19",
"@nuxtjs/style-resources": "^1.0.0",
"apexcharts": "^3.10.0",
"apexcharts": "^3.10.1",
"driver.js": "^0.9.8",
"nuxt": "^2.10.2",
"vee-validate": "^2.1.7",
"vue-apexcharts": "^1.5.0",
"vue-flatpickr-component": "^8.1.4",
"vue-good-table": "^2.18.0",
"vue-multiselect": "^2.1.6",
"vue-notification": "^1.3.16",
"vue-notification": "^1.3.20",
"vue2-dropzone": "^3.6.0",
"vue2-editor": "^2.10.2"
},
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1444,10 +1444,10 @@ anymatch@~3.1.1:
normalize-path "^3.0.0"
picomatch "^2.0.4"

apexcharts@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.10.0.tgz#a72c7d8728ea79cd9f7d2603e82235d441d46388"
integrity sha512-DtqM5hsMerjrq+InZQ6JHQQin86YSrYMMRqL0e4zPPKvLj1+P4F2ZKnTdQGLJBP8/qOJhpj6cOeHIdA+m52ECQ==
apexcharts@^3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.10.1.tgz#ac85b08796f0fef656ecc0458cf0362f75f63bad"
integrity sha512-gwxCvzQSNIVBhGHr31Ha+bmUsA3qWw6atMflVCIqZXBqcRvG1iMoxNV6GnhG975KpFErca5FFDg3xVHYQJRW/A==
dependencies:
promise-polyfill "8.1.0"
svg.draggable.js "^2.2.2"
Expand Down Expand Up @@ -8206,10 +8206,10 @@ vue-no-ssr@^1.1.1:
resolved "https://registry.yarnpkg.com/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz#875f3be6fb0ae41568a837f3ac1a80eaa137b998"
integrity sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g==

vue-notification@^1.3.16:
version "1.3.16"
resolved "https://registry.yarnpkg.com/vue-notification/-/vue-notification-1.3.16.tgz#b2eca3416a94a46e35aa2516710a0fcd2c8515ea"
integrity sha512-ZL57GcyeAnJK5ItWWkZ3+wcf3OlLFs9WIukxXwJBSIzIXUlXXxXzeVkZrhUf3Q/FkbWWAYRmzKXXP742ZiyxOw==
vue-notification@^1.3.20:
version "1.3.20"
resolved "https://registry.yarnpkg.com/vue-notification/-/vue-notification-1.3.20.tgz#d85618127763b46f3e25b8962b857947d5a97cbe"
integrity sha512-vPj67Ah72p8xvtyVE8emfadqVWguOScAjt6OJDEUdcW5hW189NsqvfkOrctxHUUO9UYl9cTbIkzAEcPnHu+zBQ==

vue-router@~3.0.7:
version "3.0.7"
Expand Down