summaryrefslogtreecommitdiff
path: root/src/client/app/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-28 20:39:32 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-28 20:39:32 +0900
commit0c63ec8157f0c54d780faf69aad63f4bcd7fd683 (patch)
treefcdde0b76f4fb81c68e0ae31a433844d0f4fbfd7 /src/client/app/common
parentwip (diff)
downloadmisskey-0c63ec8157f0c54d780faf69aad63f4bcd7fd683.tar.gz
misskey-0c63ec8157f0c54d780faf69aad63f4bcd7fd683.tar.bz2
misskey-0c63ec8157f0c54d780faf69aad63f4bcd7fd683.zip
wip
Diffstat (limited to 'src/client/app/common')
-rw-r--r--src/client/app/common/views/components/ui/button.vue78
-rw-r--r--src/client/app/common/views/widgets/broadcast.vue1
2 files changed, 48 insertions, 31 deletions
diff --git a/src/client/app/common/views/components/ui/button.vue b/src/client/app/common/views/components/ui/button.vue
index 4934a1bdfa..a165d100a4 100644
--- a/src/client/app/common/views/components/ui/button.vue
+++ b/src/client/app/common/views/components/ui/button.vue
@@ -1,9 +1,7 @@
<template>
-<div class="ui-button" :class="[styl]">
- <button :type="type" @click="$emit('click')">
- <slot></slot>
- </button>
-</div>
+<button class="dmtdnykelhudezerjlfpbhgovrgnqqgr" :class="[styl, { inline, primary }]" :type="type" @click="$emit('click')">
+ <slot></slot>
+</button>
</template>
<script lang="ts">
@@ -13,6 +11,16 @@ export default Vue.extend({
type: {
type: String,
required: false
+ },
+ primary: {
+ type: Boolean,
+ required: false,
+ default: false
+ },
+ inline: {
+ type: Boolean,
+ required: false,
+ default: false
}
},
data() {
@@ -32,21 +40,36 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
-root(fill)
- > button
- display block
- width 100%
- margin 0
- padding 0
+.dmtdnykelhudezerjlfpbhgovrgnqqgr
+ display block
+ width 100%
+ margin 0
+ padding 0
+ font-weight normal
+ font-size 16px
+ border none
+ border-radius 6px
+ outline none
+ box-shadow none
+
+ &.inline
+ display inline-block
+ width auto
+
+ &.primary
font-weight bold
- font-size 16px
- line-height 44px
- border none
- border-radius 6px
- outline none
- box-shadow none
- if fill
+ &.fill
+ color var(--text)
+ background var(--buttonBg)
+
+ &:hover
+ background var(--buttonHoverBg)
+
+ &:active
+ background var(--buttonActiveBg)
+
+ &.primary
color var(--primaryForeground)
background var(--primary)
@@ -55,20 +78,15 @@ root(fill)
&:active
background var(--primaryDarken5)
- else
- color var(--primary)
- background none
- &:hover
- color var(--primaryDarken5)
+ &:not(.fill)
+ color var(--primary)
+ background none
- &:active
- background var(--primaryAlpha03)
+ &:hover
+ color var(--primaryDarken5)
-.ui-button
- &.fill
- root(true)
- &:not(.fill)
- root(false)
+ &:active
+ background var(--primaryAlpha03)
</style>
diff --git a/src/client/app/common/views/widgets/broadcast.vue b/src/client/app/common/views/widgets/broadcast.vue
index 65e37bfc69..620b09ff0e 100644
--- a/src/client/app/common/views/widgets/broadcast.vue
+++ b/src/client/app/common/views/widgets/broadcast.vue
@@ -5,7 +5,6 @@
:data-found="announcements && announcements.length != 0"
:data-melt="props.design == 1"
:data-mobile="platform == 'mobile'"
- :data-darkmode="$store.state.device.darkmode"
>
<div class="icon">
<svg height="32" version="1.1" viewBox="0 0 32 32" width="32">