mcg/mlpcardgame
2
0
Fork 0
Code Issues 23 Pull requests 1 Releases Wiki Activity

Add basic deck builder #12

Merged
hamcha merged 42 commits from feature/deckbuilder into master 2019-09-12 09:11:32 +00:00
Conversation 2 Commits 42 Files changed 58 +13 -4
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f21433e228 - Show all commits

1
package.json
View file

@ -13,6 +13,7 @@
"babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1", "babel-eslint": "^10.0.1",
"buefy": "^0.8.2", "buefy": "^0.8.2",
"bulma-prefers-dark": "^0.1.0-beta.0",
"core-js": "^2.6.5", "core-js": "^2.6.5",
"dexie": "^2.0.4", "dexie": "^2.0.4",
"eventemitter3": "^4.0.0", "eventemitter3": "^4.0.0",

4
src/assets/scss/_variables.scss
View file

@ -163,10 +163,6 @@ $size-medium: $size-5 !default;
$size-large: $size-4 !default; $size-large: $size-4 !default;
// Input box styling // Input box styling
$input-color: $white;
$input-background-color: $black-ter;
$input-border-color: $grey-darker;
$input-focus-border-color: $turquoise; $input-focus-border-color: $turquoise;
$input-hover-border-color: scale-color($turquoise, $lightness: -30%); $input-hover-border-color: scale-color($turquoise, $lightness: -30%);

1
src/assets/scss/app.scss
View file

@ -4,6 +4,7 @@
@import "~bulma/sass/utilities/derived-variables"; @import "~bulma/sass/utilities/derived-variables";
@import "~bulma"; @import "~bulma";
@import "~buefy/src/scss/buefy"; @import "~buefy/src/scss/buefy";
@import "dark";
@import url('https://fonts.googleapis.com/css?family=Merriweather:300,400,400i,700&display=swap'); @import url('https://fonts.googleapis.com/css?family=Merriweather:300,400,400i,700&display=swap');
html { html {

6
src/assets/scss/dark.sass Normal file
View file

@ -0,0 +1,6 @@
@charset "utf-8"
@import "~bulma-prefers-dark/sass/utilities/_all"
@import "~bulma-prefers-dark/sass/base/_all"
@import "~bulma-prefers-dark/sass/elements/_all"
@import "~bulma-prefers-dark/sass/components/_all"
@import "~bulma-prefers-dark/sass/layout/_all"

5
yarn.lock
View file

@ -2225,6 +2225,11 @@ builtin-status-codes@^3.0.0:
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
bulma-prefers-dark@^0.1.0-beta.0:
version "0.1.0-beta.0"
resolved "https://registry.yarnpkg.com/bulma-prefers-dark/-/bulma-prefers-dark-0.1.0-beta.0.tgz#646350738ed00ac66d0f84ec6821a677aa1a66c5"
integrity sha512-EeDW8pQrkYEOXo2l3WykfghbUzi8jlQWGI+Cu2HwmXwQHMcoGF6yiKYCNShttN+8z3atq8fLWh3B7pqXUV4fBA==
bulma@0.7.5: bulma@0.7.5:
version "0.7.5" version "0.7.5"
resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.7.5.tgz#35066c37f82c088b68f94450be758fc00a967208" resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.7.5.tgz#35066c37f82c088b68f94450be758fc00a967208"