SWREI/switched
0
0
Fork 0
Code

wip

Browse Source
This commit is contained in:
syuilo 2018-09-27 14:32:48 +09:00
parent 76a25917c0
commit 4fe2f29478
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
19 changed files with 80 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/app/desktop/views/components/calendar.vue
View File

@ -166,10 +166,10 @@ root(isDark)
width 42px width 42px
font-size 0.9em font-size 0.9em
line-height 42px line-height 42px
color isDark ? #9baec8 : #ccc color var(--faceTextButton)
&:hover &:hover
color isDark ? #b2c1d5 : #aaa color var(--faceTextButtonHover)
&:active &:active
color isDark ? #b2c1d5 : #999 color isDark ? #b2c1d5 : #999

18
src/client/app/desktop/views/components/note-detail.vue
View File

@ -225,7 +225,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .mk-note-detail
overflow hidden overflow hidden
text-align left text-align left
background var(--face) background var(--face)
@ -327,14 +327,14 @@ root(isDark)
display block display block
text-align left text-align left
margin 0 margin 0
color isDark ? #606984 : #ccc color var(--noteHeaderAcct)
> .time > .time
position absolute position absolute
top 0 top 0
right 32px right 32px
font-size 1em font-size 1em
color isDark ? #606984 : #c0c0c0 color var(--noteHeaderInfo)
> .body > .body
padding 8px 0 padding 8px 0
@ -345,7 +345,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px
@ -358,14 +358,14 @@ root(isDark)
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
font-size 1.5em font-size 1.5em
color isDark ? #fff : #717171 color var(--noteText)
> .renote > .renote
margin 8px 0 margin 8px 0
> * > *
padding 16px padding 16px
border dashed 1px #c0dac6 border dashed 1px vat(--quoteBorder)
border-radius 8px border-radius 8px
> .location > .location
@ -419,10 +419,4 @@ root(isDark)
> * > *
border-top 1px solid var(--faceDivider) border-top 1px solid var(--faceDivider)
.mk-note-detail[data-darkmode]
root(true)
.mk-note-detail:not([data-darkmode])
root(false)
</style> </style>

2
src/client/app/desktop/views/components/note-preview.vue
View File

@ -71,7 +71,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px

2
src/client/app/desktop/views/components/notes.note.sub.vue
View File

@ -72,7 +72,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px

6
src/client/app/desktop/views/components/notes.note.vue
View File

@ -426,7 +426,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px
@ -439,7 +439,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
>>> .title >>> .title
display block display block
@ -491,7 +491,7 @@ root(isDark)
> * > *
padding 16px padding 16px
border dashed 1px isDark ? #4e945e : #c0dac6 border dashed 1px vat(--quoteBorder)
border-radius 8px border-radius 8px
> footer > footer

8
src/client/app/desktop/views/components/post-form.vue
View File

@ -434,12 +434,10 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) root(isDark)
display block display block
padding 16px padding 16px
background isDark ? #282C37 : var(--primaryLighten95) background var(--desktopPostFormBg)
&:after &:after
content "" content ""
@ -453,8 +451,8 @@ root(isDark)
width 100% width 100%
padding 12px padding 12px
font-size 16px font-size 16px
color isDark ? #fff : #333 color var(--desktopPostFormTextareaFg)
background isDark ? #191d23 : #fff background var(--desktopPostFormTextareaBg)
outline none outline none
border solid 1px var(--primaryAlpha01) border solid 1px var(--primaryAlpha01)
border-radius 4px border-radius 4px

23
src/client/app/desktop/views/components/timeline.vue
View File

@ -175,9 +175,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.mk-timeline
root(isDark)
background var(--face) background var(--face)
box-shadow var(--shadow) box-shadow var(--shadow)
border-radius var(--round) border-radius var(--round)
@ -187,7 +185,7 @@ root(isDark)
padding 0 8px padding 0 8px
z-index 10 z-index 10
background var(--faceHeader) background var(--faceHeader)
box-shadow 0 1px isDark ? rgba(#000, 0.15) : rgba(#000, 0.08) box-shadow 0 1px var(--desktopTimelineHeaderShadow)
> .buttons > .buttons
position absolute position absolute
@ -200,7 +198,7 @@ root(isDark)
padding 0 8px padding 0 8px
font-size 0.9em font-size 0.9em
line-height 42px line-height 42px
color isDark ? #9baec8 : #ccc color var(--faceTextButton)
> .badge > .badge
position absolute position absolute
@ -210,10 +208,7 @@ root(isDark)
color var(--primary) color var(--primary)
&:hover &:hover
color isDark ? #b2c1d5 : #aaa color var(--faceTextButtonHover)
&:active
color isDark ? #b2c1d5 : #999
&[data-active] &[data-active]
color var(--primary) color var(--primary)
@ -252,16 +247,10 @@ root(isDark)
background var(--primary) background var(--primary)
&:not([data-active]) &:not([data-active])
color isDark ? #9aa2a7 : #6f7477 color var(--desktopTimelineSrc)
cursor pointer cursor pointer
&:hover &:hover
color isDark ? #d9dcde : #525a5f color var(--desktopTimelineSrcHover)
.mk-timeline[data-darkmode]
root(true)
.mk-timeline:not([data-darkmode])
root(false)
</style> </style>

4
src/client/app/desktop/views/components/widget-container.vue
View File

@ -72,10 +72,10 @@ root(isDark)
width 42px width 42px
font-size 0.9em font-size 0.9em
line-height 42px line-height 42px
color isDark ? #9baec8 : #ccc color var(--faceTextButton)
&:hover &:hover
color isDark ? #b2c1d5 : #aaa color var(--faceTextButtonHover)
&:active &:active
color isDark ? #b2c1d5 : #999 color isDark ? #b2c1d5 : #999

4
src/client/app/desktop/views/pages/deck/deck.column.vue
View File

@ -344,10 +344,10 @@ root(isDark)
width $header-height width $header-height
line-height $header-height line-height $header-height
font-size 16px font-size 16px
color isDark ? #9baec8 : #ccc color var(--faceTextButton)
&:hover &:hover
color isDark ? #b2c1d5 : #aaa color var(--faceTextButtonHover)
&:active &:active
color isDark ? #b2c1d5 : #999 color isDark ? #b2c1d5 : #999

6
src/client/app/desktop/views/pages/deck/deck.note.vue
View File

@ -309,7 +309,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px
@ -321,7 +321,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
>>> .title >>> .title
display block display block
@ -387,7 +387,7 @@ root(isDark)
> * > *
padding 16px padding 16px
border dashed 1px isDark ? #4e945e : #c0dac6 border dashed 1px vat(--quoteBorder)
border-radius 8px border-radius 8px
> .app > .app

4
src/client/app/desktop/views/pages/deck/deck.notification.vue
View File

@ -146,10 +146,10 @@ root(isDark)
font-size 0.9em font-size 0.9em
> .note-preview > .note-preview
color isDark ? #fff : #717171 color var(--noteText)
> .note-ref > .note-ref
color isDark ? #fff : #717171 color var(--noteText)
[data-fa] [data-fa]
font-size 1em font-size 1em

20
src/client/app/mobile/views/components/note-detail.vue
View File

@ -223,7 +223,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .mk-note-detail
overflow hidden overflow hidden
width 100% width 100%
text-align left text-align left
@ -334,7 +334,7 @@ root(isDark)
display block display block
text-align left text-align left
margin 0 margin 0
color isDark ? #606984 : #ccc color var(--noteHeaderAcct)
> .body > .body
padding 8px 0 padding 8px 0
@ -345,7 +345,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px
@ -358,7 +358,7 @@ root(isDark)
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
font-size 16px font-size 16px
color isDark ? #fff : #717171 color var(--noteText)
@media (min-width 500px) @media (min-width 500px)
font-size 24px font-size 24px
@ -368,7 +368,7 @@ root(isDark)
> * > *
padding 16px padding 16px
border dashed 1px #c0dac6 border dashed 1px vat(--quoteBorder)
border-radius 8px border-radius 8px
> .location > .location
@ -393,7 +393,7 @@ root(isDark)
> .time > .time
font-size 16px font-size 16px
color isDark ? #606984 : #c0c0c0 color var(--noteHeaderInfo)
> footer > footer
font-size 1.2em font-size 1.2em
@ -412,7 +412,7 @@ root(isDark)
margin-right 28px margin-right 28px
&:hover &:hover
color isDark ? #9198af : #666 color var(--noteActionsHover)
> .count > .count
display inline display inline
@ -426,10 +426,4 @@ root(isDark)
> * > *
border-top 1px solid var(--faceDivider) border-top 1px solid var(--faceDivider)
.mk-note-detail[data-darkmode]
root(true)
.mk-note-detail:not([data-darkmode])
root(false)
</style> </style>

2
src/client/app/mobile/views/components/note-preview.vue
View File

@ -88,7 +88,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px

2
src/client/app/mobile/views/components/note.sub.vue
View File

@ -95,7 +95,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px

6
src/client/app/mobile/views/components/note.vue
View File

@ -349,7 +349,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
> .text > .text
margin-right 8px margin-right 8px
@ -361,7 +361,7 @@ root(isDark)
margin 0 margin 0
padding 0 padding 0
overflow-wrap break-word overflow-wrap break-word
color isDark ? #fff : #717171 color var(--noteText)
>>> .title >>> .title
display block display block
@ -427,7 +427,7 @@ root(isDark)
> * > *
padding 16px padding 16px
border dashed 1px isDark ? #4e945e : #c0dac6 border dashed 1px vat(--quoteBorder)
border-radius 8px border-radius 8px
> .app > .app

4
src/client/app/mobile/views/components/notification.vue
View File

@ -158,10 +158,10 @@ root(isDark)
font-size 0.9em font-size 0.9em
> .note-preview > .note-preview
color isDark ? #fff : #717171 color var(--noteText)
> .note-ref > .note-ref
color isDark ? #fff : #717171 color var(--noteText)
[data-fa] [data-fa]
font-size 1em font-size 1em

24
src/client/theme/dark.json
View File

@ -13,11 +13,22 @@
"face": "#282c37", "face": "#282c37",
"faceHeader": "#313543", "faceHeader": "#313543",
"faceDivider": "rgba(0, 0, 0, 0.3)", "faceDivider": "rgba(0, 0, 0, 0.3)",
"faceTextButton": "#9baec8",
"faceTextButtonHover": "#b2c1d5",
"popupBg": "#2c303c", "popupBg": "#2c303c",
"popupFg": "#d6dce2", "popupFg": "#d6dce2",
"subNoteBg": "rgba(0, 0, 0, 0.18)", "subNoteBg": "rgba(0, 0, 0, 0.18)",
"renoteGradient": "#314027", "renoteGradient": "#314027",
"renoteText": "#9dbb00", "renoteText": "#9dbb00",
"quoteBorder": "#4e945e",
"noteText": "#fff",
"noteHeaderName": "#fff",
"noteHeaderBadgeFg": "#758188",
"noteHeaderBadgeBg": "rgba(0, 0, 0, 0.25)",
"noteHeaderAdminFg": "#f15f71",
"noteHeaderAdminBg": "#5d282e",
"noteHeaderAcct": "#606984",
"noteHeaderInfo": "#606984",
"noteActions": "#606984", "noteActions": "#606984",
"noteActionsHover": "#a1a8bf", "noteActionsHover": "#a1a8bf",
"noteActionsReplyHover": "#0af", "noteActionsReplyHover": "#0af",
@ -28,13 +39,6 @@
"dateDividerBg": "#242731", "dateDividerBg": "#242731",
"dateDividerFg": "#666b79", "dateDividerFg": "#666b79",
"switchTrack": "rgba(255, 255, 255, 0.15)", "switchTrack": "rgba(255, 255, 255, 0.15)",
"noteHeaderName": "#fff",
"noteHeaderBadgeFg": "#758188",
"noteHeaderBadgeBg": "rgba(0, 0, 0, 0.25)",
"noteHeaderAdminFg": "#f15f71",
"noteHeaderAdminBg": "#5d282e",
"noteHeaderAcct": "#606984",
"noteHeaderInfo": "#606984",
"autocompleteItemHoverBg": "rgba(255, 255, 255, 0.1)", "autocompleteItemHoverBg": "rgba(255, 255, 255, 0.1)",
"autocompleteItemText": "rgba(255, 255, 255, 0.8)", "autocompleteItemText": "rgba(255, 255, 255, 0.8)",
"autocompleteItemTextSub": "rgba(255, 255, 255, 0.3)", "autocompleteItemTextSub": "rgba(255, 255, 255, 0.3)",
@ -43,6 +47,12 @@
"cwButtonHoverBg": "#707b97", "cwButtonHoverBg": "#707b97",
"reactionPickerButtonHoverBg": "rgba(255, 255, 255, 0.18)", "reactionPickerButtonHoverBg": "rgba(255, 255, 255, 0.18)",
"desktopHeaderBg": "#313543", "desktopHeaderBg": "#313543",
"desktopPostFormBg": "@face",
"desktopPostFormTextareaBg": "rgba(0, 0, 0, 0.25)",
"desktopPostFormTextareaFg": "#fff",
"desktopTimelineHeaderShadow": "rgba(0, 0, 0, 0.15)",
"desktopTimelineSrc": "@faceTextButton",
"desktopTimelineSrcHover": "@faceTextButtonHover",
"mobileSignedInAsBg": "#273c34", "mobileSignedInAsBg": "#273c34",
"mobileSignedInAsFg": "#49ab63", "mobileSignedInAsFg": "#49ab63",
"mobileSignoutBg": "#652222", "mobileSignoutBg": "#652222",

2
src/client/theme/halloween.json
View File

@ -8,7 +8,7 @@
"primary": "#fb8d4e", "primary": "#fb8d4e",
"primaryForeground": "#fff", "primaryForeground": "#fff",
"bg": "#1b1a35", "bg": "#1b1a35",
"face": "#2e2a3e", "face": "#322e44",
"faceHeader": "#36314e", "faceHeader": "#36314e",
"dateDividerBg": "#26253c", "dateDividerBg": "#26253c",
"popupBg": "#2c303c", "popupBg": "#2c303c",

24
src/client/theme/light.json
View File

@ -13,11 +13,22 @@
"face": "#fff", "face": "#fff",
"faceHeader": "#fff", "faceHeader": "#fff",
"faceDivider": "rgba(0, 0, 0, 0.082)", "faceDivider": "rgba(0, 0, 0, 0.082)",
"faceTextButton": "#ccc",
"faceTextButtonHover": "#aaa",
"popupBg": "#fff", "popupBg": "#fff",
"popupFg": "#586069", "popupFg": "#586069",
"subNoteBg": "rgba(0, 0, 0, 0.01)", "subNoteBg": "rgba(0, 0, 0, 0.01)",
"renoteGradient": "#edfde2", "renoteGradient": "#edfde2",
"renoteText": "#9dbb00", "renoteText": "#9dbb00",
"quoteBorder": "#c0dac6",
"noteText": "#717171",
"noteHeaderName": "#627079",
"noteHeaderBadgeFg": "#aaa",
"noteHeaderBadgeBg": "rgba(0, 0, 0, 0.05)",
"noteHeaderAdminFg": "#f15f71",
"noteHeaderAdminBg": "#5d282e",
"noteHeaderAcct": "#ccc",
"noteHeaderInfo": "#c0c0c0",
"noteActions": "#ddd", "noteActions": "#ddd",
"noteActionsHover": "#444", "noteActionsHover": "#444",
"noteActionsReplyHover": "#0af", "noteActionsReplyHover": "#0af",
@ -28,13 +39,6 @@
"dateDividerBg": "#fdfdfd", "dateDividerBg": "#fdfdfd",
"dateDividerFg": "#aaa", "dateDividerFg": "#aaa",
"switchTrack": "rgba(0, 0, 0, 0.25)", "switchTrack": "rgba(0, 0, 0, 0.25)",
"noteHeaderName": "#627079",
"noteHeaderBadgeFg": "#aaa",
"noteHeaderBadgeBg": "rgba(0, 0, 0, 0.05)",
"noteHeaderAdminFg": "#f15f71",
"noteHeaderAdminBg": "#5d282e",
"noteHeaderAcct": "#ccc",
"noteHeaderInfo": "#c0c0c0",
"autocompleteItemHoverBg": "rgba(0, 0, 0, 0.1)", "autocompleteItemHoverBg": "rgba(0, 0, 0, 0.1)",
"autocompleteItemText": "rgba(0, 0, 0, 0.8)", "autocompleteItemText": "rgba(0, 0, 0, 0.8)",
"autocompleteItemTextSub": "rgba(0, 0, 0, 0.3)", "autocompleteItemTextSub": "rgba(0, 0, 0, 0.3)",
@ -43,6 +47,12 @@
"cwButtonHoverBg": "#bbc4ce", "cwButtonHoverBg": "#bbc4ce",
"reactionPickerButtonHoverBg": "#eee", "reactionPickerButtonHoverBg": "#eee",
"desktopHeaderBg": "#f7f7f7", "desktopHeaderBg": "#f7f7f7",
"desktopPostFormBg": "#fff6f6",
"desktopPostFormTextareaBg": "#fff",
"desktopPostFormTextareaFg": "#333",
"desktopTimelineHeaderShadow": "rgba(0, 0, 0, 0.08)",
"desktopTimelineSrc": "#6f7477",
"desktopTimelineSrcHover": "#525a5f",
"mobileSignedInAsBg": "#fcfff5", "mobileSignedInAsBg": "#fcfff5",
"mobileSignedInAsFg": "#2c662d", "mobileSignedInAsFg": "#2c662d",
"mobileSignoutBg": "#fff6f5", "mobileSignoutBg": "#fff6f5",