summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-27 00:54:37 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-27 00:54:37 +0900
commit3cbdfcb43d4b4435d9ecd50657607979317d2749 (patch)
tree2d6be458990576b4b9ae9b8eb61dd32f4ffdcba6 /src/client
parentwip (diff)
downloadsharkey-3cbdfcb43d4b4435d9ecd50657607979317d2749.tar.gz
sharkey-3cbdfcb43d4b4435d9ecd50657607979317d2749.tar.bz2
sharkey-3cbdfcb43d4b4435d9ecd50657607979317d2749.zip
wip
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/note-header.vue2
-rw-r--r--src/client/app/desktop/views/components/notes.note.vue2
-rw-r--r--src/client/app/desktop/views/components/notes.vue4
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.note.vue2
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.notes.vue4
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.notifications.vue4
-rw-r--r--src/client/app/mobile/views/components/note.vue2
-rw-r--r--src/client/app/mobile/views/components/notes.vue4
-rw-r--r--src/client/app/mobile/views/components/notifications.vue4
-rw-r--r--src/client/theme/dark.json1
-rw-r--r--src/client/theme/light.json1
11 files changed, 16 insertions, 14 deletions
diff --git a/src/client/app/common/views/components/note-header.vue b/src/client/app/common/views/components/note-header.vue
index f4a2f00876..48dfae5f84 100644
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@@ -110,7 +110,7 @@ root(isDark)
> .app
margin-right 8px
padding-right 8px
- border-right solid 1px isDark ? #1c2023 : #eaeaea
+ border-right solid 1px var(--faceDivider)
> .visibility
margin-left 8px
diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue
index 13a8641170..4f2b0241e8 100644
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@@ -323,7 +323,7 @@ root(isDark)
margin 0
padding 0
background var(--face)
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
&[data-round]
&:first-child
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index 0bd45b1c21..d0148eef58 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -237,7 +237,7 @@ root(isDark)
text-align center
color isDark ? #666b79 : #aaa
background isDark ? #242731 : #fdfdfd
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
span
margin 0 16px
@@ -261,7 +261,7 @@ root(isDark)
text-align center
color #ccc
background var(--face)
- border-top solid 1px isDark ? #1c2023 : #eaeaea
+ border-top solid 1px var(--faceDivider)
border-bottom-left-radius 6px
border-bottom-right-radius 6px
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue
index 82e816cc8c..04ddcd488d 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note.vue
@@ -228,7 +228,7 @@ mediaRoot(isDark)
root(isDark)
font-size 13px
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
&:last-of-type
border-bottom none
diff --git a/src/client/app/desktop/views/pages/deck/deck.notes.vue b/src/client/app/desktop/views/pages/deck/deck.notes.vue
index 1217e0d4da..214ec3cdf7 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notes.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue
@@ -216,7 +216,7 @@ root(isDark)
text-align center
color isDark ? #666b79 : #aaa
background isDark ? #242731 : #fdfdfd
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
span
margin 0 16px
@@ -233,7 +233,7 @@ root(isDark)
text-align center
color #ccc
background var(--face)
- border-top solid 1px isDark ? #1c2023 : #eaeaea
+ border-top solid 1px var(--faceDivider)
border-bottom-left-radius 6px
border-bottom-right-radius 6px
diff --git a/src/client/app/desktop/views/pages/deck/deck.notifications.vue b/src/client/app/desktop/views/pages/deck/deck.notifications.vue
index f73f221b7b..8a28061260 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notifications.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notifications.vue
@@ -169,7 +169,7 @@ root(isDark)
> .notifications
> .notification:not(:last-child)
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
> .date
display block
@@ -179,7 +179,7 @@ root(isDark)
font-size 0.8em
color isDark ? #666b79 : #aaa
background isDark ? #242731 : #fdfdfd
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
span
margin 0 16px
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index 2bfd8f8acc..a8b733fae7 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -232,7 +232,7 @@ export default Vue.extend({
root(isDark)
font-size 12px
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
&:last-of-type
border-bottom none
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 539141954b..8841b0e6bf 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -245,7 +245,7 @@ root(isDark)
font-size 0.9em
color isDark ? #666b79 : #aaa
background isDark ? #242731 : #fdfdfd
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
span
margin 0 16px
@@ -276,7 +276,7 @@ root(isDark)
> footer
text-align center
- border-top solid 1px isDark ? #1c2023 : #eaeaea
+ border-top solid 1px var(--faceDivider)
&:empty
display none
diff --git a/src/client/app/mobile/views/components/notifications.vue b/src/client/app/mobile/views/components/notifications.vue
index 11ac23f4b1..8243a9bfb3 100644
--- a/src/client/app/mobile/views/components/notifications.vue
+++ b/src/client/app/mobile/views/components/notifications.vue
@@ -126,7 +126,7 @@ root(isDark)
> .notifications
> .mk-notification:not(:last-child)
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
> .date
display block
@@ -136,7 +136,7 @@ root(isDark)
font-size 0.8em
color isDark ? #666b79 : #aaa
background isDark ? #242731 : #fdfdfd
- border-bottom solid 1px isDark ? #1c2023 : #eaeaea
+ border-bottom solid 1px var(--faceDivider)
span
margin 0 16px
diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json
index 5d0272a375..cf9306558b 100644
--- a/src/client/theme/dark.json
+++ b/src/client/theme/dark.json
@@ -10,6 +10,7 @@
"scrollbarHandleHover": "#535660",
"face": "#282c37",
"faceHeader": "#313543",
+ "faceDivider": "rgba(0, 0, 0, 0.3)",
"mobileSignedInAsBg": "#273c34",
"mobileSignedInAsFg": "#49ab63",
"mobileSignoutBg": "#652222",
diff --git a/src/client/theme/light.json b/src/client/theme/light.json
index 4cba3be499..64ebd8e293 100644
--- a/src/client/theme/light.json
+++ b/src/client/theme/light.json
@@ -10,6 +10,7 @@
"scrollbarHandleHover": "#00000066",
"face": "#fff",
"faceHeader": "#fff",
+ "faceDivider": "rgba(0, 0, 0, 0.082)",
"mobileSignedInAsBg": "#fcfff5",
"mobileSignedInAsFg": "#2c662d",
"mobileSignoutBg": "#fff6f5",