Compare commits

...

2 commits

Author SHA1 Message Date
b9e0d096ba
Fix picked event
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2019-09-10 14:47:53 +02:00
89122a915e
Add merriweather font for deck title 2019-09-10 14:47:40 +02:00
5 changed files with 66 additions and 27 deletions

View file

@ -168,4 +168,7 @@ $input-color: $white;
$input-background-color: $black-ter;
$input-border-color: $grey-darker;
$input-focus-border-color: $turquoise;
$input-hover-border-color: scale-color($turquoise, $lightness: -30%);
$input-hover-border-color: scale-color($turquoise, $lightness: -30%);
$fantasy: 'Merriweather';
$primary-text: scale-color($primary, $saturation: -50%, $lightness: 20%);

View file

@ -4,6 +4,7 @@
@import "~bulma/sass/utilities/derived-variables";
@import "~bulma";
@import "~buefy/src/scss/buefy";
@import url('https://fonts.googleapis.com/css?family=Merriweather:300,400,400i,700&display=swap');
html {
scrollbar-color: #404245 #2f3132;
@ -12,5 +13,5 @@ html {
}
body {
color: white;
color: $white;
}

View file

@ -54,7 +54,7 @@ export default class CardPicker extends Vue {
return cardImageURL(id);
}
private picked(card: Card) {
private _picked(card: Card) {
this.$emit("picked", card);
}
}

View file

@ -10,6 +10,21 @@
<style lang="scss" scoped>
.decklist {
display: flex;
flex-direction: column;
article {
display: flex;
align-content: space-between;
}
}
.amt {
margin: 0 5px;
font-weight: bold;
&:after {
content: "x";
font-weight: 300;
}
}
</style>

View file

@ -55,12 +55,17 @@
</section>
</section>
<section class="decklist">
<header>
<h1>{{ deckname }}</h1>
</header>
<DeckList :cards="decklist" />
</section>
</section>
</template>
<style lang="scss" scoped>
@import "@/assets/scss/_variables";
.deckbuilder {
background: url("../assets/images/backgrounds/deckbuilderbg.webp") center;
background-repeat: no-repeat;
@ -68,34 +73,45 @@
height: 100vh;
display: grid;
grid-template-columns: 3fr minmax(250px, 1fr);
}
.cardlist {
display: grid;
grid-column: 1;
grid-template-rows: 110px 1fr;
.cardlist {
display: grid;
grid-column: 1;
grid-template-rows: 110px 1fr;
}
.filters {
display: flex;
flex-direction: column;
padding: 5px;
.row {
flex: 1;
display: flex;
align-items: center;
* {
margin: 5px;
}
}
}
.cards {
display: grid;
grid-template-columns: 5% 1fr 5%;
.filters {
display: flex;
flex-direction: column;
padding: 5px;
.row {
flex: 1;
display: flex;
align-items: center;
* {
margin: 5px;
}
}
.decklist {
grid-column: 2;
}
.cards {
display: grid;
grid-template-columns: 5% 1fr 5%;
}
.decklist {
header {
padding: 10px;
padding-top: 15px;
color: $primary-text;
font-family: $fantasy;
h1 {
font-size: 20pt;
font-weight: 700;
}
}
grid-column: 2;
}
.colorfilter,
@ -313,6 +329,9 @@ export default class DeckBuilder extends Vue {
private elementFilters!: string[];
private typeFilters!: string[];
// Decklist options
private deckname!: string;
// Navigation
private offset!: number;
@ -330,7 +349,8 @@ export default class DeckBuilder extends Vue {
typeFilters: [],
colors: colorNames,
sets: allSets.slice(0, -1),
types: typeNames
types: typeNames,
deckname: "Unnamed deck"
};
}