summaryrefslogtreecommitdiff
path: root/src/client/app/desktop/views/components
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-26 20:28:13 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-26 20:28:13 +0900
commitf5f2215b47ce4590788dce2af1c8e4e586548e77 (patch)
tree5d1854d8b6400937005d086850c973df5e462fb7 /src/client/app/desktop/views/components
parentwip (diff)
downloadmisskey-f5f2215b47ce4590788dce2af1c8e4e586548e77.tar.gz
misskey-f5f2215b47ce4590788dce2af1c8e4e586548e77.tar.bz2
misskey-f5f2215b47ce4590788dce2af1c8e4e586548e77.zip
wip
Diffstat (limited to 'src/client/app/desktop/views/components')
-rw-r--r--src/client/app/desktop/views/components/calendar.vue2
-rw-r--r--src/client/app/desktop/views/components/context-menu.vue2
-rw-r--r--src/client/app/desktop/views/components/drive.vue2
-rw-r--r--src/client/app/desktop/views/components/note-detail.vue2
-rw-r--r--src/client/app/desktop/views/components/notes.note.vue2
-rw-r--r--src/client/app/desktop/views/components/notes.vue2
-rw-r--r--src/client/app/desktop/views/components/timeline.vue4
-rw-r--r--src/client/app/desktop/views/components/ui-notification.vue2
-rw-r--r--src/client/app/desktop/views/components/ui.header.account.vue2
-rw-r--r--src/client/app/desktop/views/components/ui.header.notifications.vue2
-rw-r--r--src/client/app/desktop/views/components/user-preview.vue4
-rw-r--r--src/client/app/desktop/views/components/widget-container.vue4
-rw-r--r--src/client/app/desktop/views/components/window.vue4
13 files changed, 17 insertions, 17 deletions
diff --git a/src/client/app/desktop/views/components/calendar.vue b/src/client/app/desktop/views/components/calendar.vue
index 2414ced0c9..cd73ab350b 100644
--- a/src/client/app/desktop/views/components/calendar.vue
+++ b/src/client/app/desktop/views/components/calendar.vue
@@ -132,7 +132,7 @@ export default Vue.extend({
root(isDark)
color isDark ? #c5ced6 : #777
- background isDark ? #282C37 : #fff
+ background var(--face)
box-shadow var(--shadow)
border-radius var(--round)
overflow hidden
diff --git a/src/client/app/desktop/views/components/context-menu.vue b/src/client/app/desktop/views/components/context-menu.vue
index 49aeac143f..170dcf55a1 100644
--- a/src/client/app/desktop/views/components/context-menu.vue
+++ b/src/client/app/desktop/views/components/context-menu.vue
@@ -82,7 +82,7 @@ root(isDark)
z-index 4096
width $width
font-size 0.8em
- background isDark ? #282c37 : #fff
+ background var(--face)
border-radius 0 4px 4px 4px
box-shadow 2px 2px 8px rgba(#000, 0.2)
opacity 0
diff --git a/src/client/app/desktop/views/components/drive.vue b/src/client/app/desktop/views/components/drive.vue
index ccfdb3159f..a1748963aa 100644
--- a/src/client/app/desktop/views/components/drive.vue
+++ b/src/client/app/desktop/views/components/drive.vue
@@ -596,7 +596,7 @@ root(isDark)
overflow auto
font-size 0.9em
color isDark ? #d2d9dc : #555
- background isDark ? #282c37 : #fff
+ background var(--face)
box-shadow 0 1px 0 rgba(#000, 0.05)
&, *
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index f004ca88ee..35eb6ac45d 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -230,7 +230,7 @@ export default Vue.extend({
root(isDark)
overflow hidden
text-align left
- background isDark ? #282C37 : #fff
+ background var(--face)
box-shadow var(--shadow)
border-radius var(--round)
diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue
index a91212221b..13a8641170 100644
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@@ -322,7 +322,7 @@ export default Vue.extend({
root(isDark)
margin 0
padding 0
- background isDark ? #282C37 : #fff
+ background var(--face)
border-bottom solid 1px isDark ? #1c2023 : #eaeaea
&[data-round]
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index 2e3ffd171b..0bd45b1c21 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -260,7 +260,7 @@ root(isDark)
width 100%
text-align center
color #ccc
- background isDark ? #282C37 : #fff
+ background var(--face)
border-top solid 1px isDark ? #1c2023 : #eaeaea
border-bottom-left-radius 6px
border-bottom-right-radius 6px
diff --git a/src/client/app/desktop/views/components/timeline.vue b/src/client/app/desktop/views/components/timeline.vue
index 32ed89ef0b..7800eae52d 100644
--- a/src/client/app/desktop/views/components/timeline.vue
+++ b/src/client/app/desktop/views/components/timeline.vue
@@ -178,7 +178,7 @@ export default Vue.extend({
root(isDark)
- background isDark ? #282C37 : #fff
+ background var(--face)
box-shadow var(--shadow)
border-radius var(--round)
overflow hidden
@@ -186,7 +186,7 @@ root(isDark)
> header
padding 0 8px
z-index 10
- background isDark ? #313543 : #fff
+ background var(--faceHeader)
box-shadow 0 1px isDark ? rgba(#000, 0.15) : rgba(#000, 0.08)
> .buttons
diff --git a/src/client/app/desktop/views/components/ui-notification.vue b/src/client/app/desktop/views/components/ui-notification.vue
index 7519124870..883a880e5d 100644
--- a/src/client/app/desktop/views/components/ui-notification.vue
+++ b/src/client/app/desktop/views/components/ui-notification.vue
@@ -47,7 +47,7 @@ root(isDark)
padding 128px 0 0 0
width 500px
color rgba(isDark ? #fff : #000, 0.6)
- background rgba(isDark ? #282C37 : #fff, 0.9)
+ //background rgba(var(--face), 0.9)
border-radius 0 0 8px 8px
box-shadow 0 2px 4px rgba(#000, isDark ? 0.4 : 0.2)
transform translateY(-64px)
diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
index 301efeb3e2..c728fa42be 100644
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -177,7 +177,7 @@ root(isDark)
transition filter 100ms ease
> .menu
- $bgcolor = isDark ? #282c37 : #fff
+ $bgcolor = var(--face)
display block
position absolute
top 56px
diff --git a/src/client/app/desktop/views/components/ui.header.notifications.vue b/src/client/app/desktop/views/components/ui.header.notifications.vue
index f9b68fa0e9..2a38655f3a 100644
--- a/src/client/app/desktop/views/components/ui.header.notifications.vue
+++ b/src/client/app/desktop/views/components/ui.header.notifications.vue
@@ -96,7 +96,7 @@ root(isDark)
color var(--primary)
> .pop
- $bgcolor = isDark ? #282c37 : #fff
+ $bgcolor = var(--face)
display block
position absolute
top 56px
diff --git a/src/client/app/desktop/views/components/user-preview.vue b/src/client/app/desktop/views/components/user-preview.vue
index f988bb21e9..01b6cdbdc5 100644
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -90,7 +90,7 @@ root(isDark)
z-index 2048
margin-top -8px
width 250px
- background isDark ? #282c37 : #fff
+ background var(--face)
background-clip content-box
border solid 1px rgba(#000, 0.1)
border-radius 4px
@@ -111,7 +111,7 @@ root(isDark)
z-index 2
width 58px
height 58px
- border solid 3px isDark ? #282c37 : #fff
+ border solid 3px var(--face)
border-radius 8px
> .title
diff --git a/src/client/app/desktop/views/components/widget-container.vue b/src/client/app/desktop/views/components/widget-container.vue
index fbf7691cd3..d17b9c91d8 100644
--- a/src/client/app/desktop/views/components/widget-container.vue
+++ b/src/client/app/desktop/views/components/widget-container.vue
@@ -35,7 +35,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
root(isDark)
- background isDark ? #282C37 : #fff
+ background var(--face)
box-shadow var(--shadow)
border-radius var(--round)
overflow hidden
@@ -45,7 +45,7 @@ root(isDark)
box-shadow none !important
> header
- background isDark ? #313543 : #fff
+ background var(--faceHeader)
> .title
z-index 1
diff --git a/src/client/app/desktop/views/components/window.vue b/src/client/app/desktop/views/components/window.vue
index 2b01c24ca8..15aa158073 100644
--- a/src/client/app/desktop/views/components/window.vue
+++ b/src/client/app/desktop/views/components/window.vue
@@ -562,7 +562,7 @@ root(isDark)
> .body
height 100%
overflow hidden
- background isDark ? #282C37 : #fff
+ background var(--face)
border-radius 6px
if isDark
@@ -578,7 +578,7 @@ root(isDark)
overflow hidden
white-space nowrap
cursor move
- background isDark ? #313543 : #fff
+ background var(--faceHeader)
border-radius 6px 6px 0 0
box-shadow 0 1px 0 rgba(#000, 0.1)