Skip to content

Commit

Permalink
Merge pull request #5 from zzzi-ori/event-ui-2.0
Browse files Browse the repository at this point in the history
Event UI 2.0
  • Loading branch information
da-in authored Apr 13, 2024
2 parents d419f8e + d6af470 commit 8095835
Show file tree
Hide file tree
Showing 12 changed files with 295 additions and 232 deletions.
6 changes: 4 additions & 2 deletions src/assets/checkbox-active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/checkbox-default.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/assets/event-zzio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/rank-banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion src/components/ZInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const style = cva(
variants: {
filled: {
true: '',
false: 'border-dark-green',
false: 'border-transBlack-15',
},
disabled: {
true: 'bg-[#D4FFE6] border-dark-green text-dark-gray',
Expand All @@ -57,3 +57,15 @@ const style = cva(
},
)
</script>
<style scoped>
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}
/* Firefox */
input[type=number] {
-moz-appearance: textfield;
}
</style>
24 changes: 12 additions & 12 deletions src/components/button/ZButton.vue
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<template>
<button :class="style({disabled, color})" :disabled="disabled">
<LeftLine/>
<slot/>
<RightLine/>
<LeftLine />
<slot />
<RightLine />
</button>
</template>
<script setup lang="ts">
import {cva} from 'class-variance-authority'
import {PropType} from 'vue'
import { cva } from 'class-variance-authority'
import { PropType } from 'vue'
import LeftLine from '../../components/button/_assets/LeftLine.vue'
import RightLine from '../../components/button/_assets/RightLine.vue'
defineProps({
disabled: {type: Boolean, default: false},
color: {type: String as PropType<ButtonColor>, default: 'primary'}
disabled: { type: Boolean, default: false },
color: { type: String as PropType<ButtonColor>, default: 'primary' },
})
type ButtonColor = 'primary' | 'secondary'
const style = cva(
[
'text-black text-body-b',
'flex justify-between w-full rounded-[8px] px-[12px] py-[11px] border-2'
'flex justify-between w-full rounded-[8px] px-[12px] py-[11px] border-2',
]
, {
variants: {
disabled: {
true: 'border-dark-green text-dark-green bg-green',
false: 'border-black'
true: 'border-transBlack-15 text-transBlack-15 bg-transBlack-10',
false: 'border-black',
},
color: {
'primary': 'bg-[#FCBF31]',
'secondary': 'bg-green'
}
'secondary': 'bg-green',
},
},
})
</script>
2 changes: 1 addition & 1 deletion src/pages/play/PlayPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<script setup lang="ts">
import { onBeforeUnmount, onMounted, ref } from 'vue'
import NextBlock from './_components/NextBlock.vue'
import GameOver from './_components/GameOver.vue'
import GameOver from './game-over/GameOver.vue'
import Ground from './_components/Ground.vue'
import Score from './_components/Score.vue'
import { usePlayer } from '../../hooks/use-player.ts'
Expand Down
Loading

0 comments on commit 8095835

Please sign in to comment.