diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-29 14:38:06 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-29 14:38:06 +0900 |
| commit | c0673884c542b1ba8a020c7b025d59fb0fe45fb3 (patch) | |
| tree | efd701b1f5957f7f912c2bd8ba5b95bbe795798a /src/client | |
| parent | Fix bug (diff) | |
| download | misskey-c0673884c542b1ba8a020c7b025d59fb0fe45fb3.tar.gz misskey-c0673884c542b1ba8a020c7b025d59fb0fe45fb3.tar.bz2 misskey-c0673884c542b1ba8a020c7b025d59fb0fe45fb3.zip | |
:art:
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/ui/button.vue | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/client/app/common/views/components/ui/button.vue b/src/client/app/common/views/components/ui/button.vue index 7b443a1ac5..adf43f6d8c 100644 --- a/src/client/app/common/views/components/ui/button.vue +++ b/src/client/app/common/views/components/ui/button.vue @@ -1,7 +1,7 @@ <template> <component class="dmtdnykelhudezerjlfpbhgovrgnqqgr" :is="link ? 'a' : 'button'" - :class="{ inline, primary, wait }" + :class="{ inline, primary, wait, round: $store.state.device.roundedCorners }" :type="type" @click="$emit('click')" @mousedown="onMousedown" @@ -116,7 +116,6 @@ export default Vue.extend({ font-size 16px line-height 24px border none - border-radius 6px outline none box-shadow none text-decoration none @@ -124,6 +123,9 @@ export default Vue.extend({ color var(--text) background var(--buttonBg) + &.round + border-radius 6px + &:not(:disabled):hover background var(--buttonHoverBg) @@ -157,7 +159,9 @@ export default Vue.extend({ bottom -5px left -5px border 2px solid var(--primaryAlpha03) - border-radius 10px + + &.round:focus:after + border-radius 10px &:not(.inline) + .dmtdnykelhudezerjlfpbhgovrgnqqgr margin-top 16px @@ -197,7 +201,6 @@ export default Vue.extend({ left 0 width 100% height 100% - border-radius 6px overflow hidden >>> div @@ -210,6 +213,9 @@ export default Vue.extend({ transform scale(1) transition all 0.5s cubic-bezier(0, .5, .5, 1) + &.round > .ripples + border-radius 6px + &.primary > .ripples >>> div background rgba(0, 0, 0, 0.15) |