summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-27 16:58:00 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-27 16:58:00 +0900
commit5f289e47676b790b6ac2d6c8cb887300e190fd73 (patch)
tree86bd8ccbb1c40ea02308a31a8d9ae3bc7435cd56 /src/client
parentwip (diff)
downloadmisskey-5f289e47676b790b6ac2d6c8cb887300e190fd73.tar.gz
misskey-5f289e47676b790b6ac2d6c8cb887300e190fd73.tar.bz2
misskey-5f289e47676b790b6ac2d6c8cb887300e190fd73.zip
wip
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/visibility-chooser.vue19
-rw-r--r--src/client/theme/halloween.json4
2 files changed, 7 insertions, 16 deletions
diff --git a/src/client/app/common/views/components/visibility-chooser.vue b/src/client/app/common/views/components/visibility-chooser.vue
index 5faf09fa11..02f33bfbc0 100644
--- a/src/client/app/common/views/components/visibility-chooser.vue
+++ b/src/client/app/common/views/components/visibility-chooser.vue
@@ -127,11 +127,9 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
-
-
$border-color = rgba(27, 31, 35, 0.15)
-root(isDark)
+.mk-visibility-chooser
position initial
> .backdrop
@@ -141,7 +139,7 @@ root(isDark)
z-index 10000
width 100%
height 100%
- background isDark ? rgba(#000, 0.4) : rgba(#000, 0.1)
+ background var(--modalBackdrop)
opacity 0
> .popover
@@ -189,14 +187,14 @@ root(isDark)
display flex
padding 8px 14px
font-size 12px
- color isDark ? #fff : #666
+ color var(--popupFg)
cursor pointer
&:hover
- background isDark ? #252731 : #eee
+ background var(--faceClearButtonHover)
&:active
- background isDark ? #21242b : #ddd
+ background var(--faceClearButtonActive)
&.active
color var(--primaryForeground)
@@ -222,11 +220,4 @@ root(isDark)
> span:last-child:not(:first-child)
opacity 0.6
-
-.mk-visibility-chooser[data-darkmode]
- root(true)
-
-.mk-visibility-chooser:not([data-darkmode])
- root(false)
-
</style>
diff --git a/src/client/theme/halloween.json b/src/client/theme/halloween.json
index 420a03d2cd..154755fe90 100644
--- a/src/client/theme/halloween.json
+++ b/src/client/theme/halloween.json
@@ -5,13 +5,13 @@
"author": "syuilo",
"inherit": "9978f7f9-5616-44fd-a704-cc5985efdd63"
},
- "primary": "#fb8d4e",
+ "primary": "#d67036",
"primaryForeground": "#fff",
"bg": "#1b1a35",
"face": "#322e44",
"faceHeader": "#36314e",
"dateDividerBg": "#26253c",
- "popupBg": "#2c303c",
+ "popupBg": "@face",
"popupFg": "#d6dce2",
"renoteGradient": "#5d2d1a",
"renoteText": "#ff6c00",