diff --git a/src/client/app/common/views/components/switch.vue b/src/client/app/common/views/components/switch.vue index 19a4adc3de..32caab638a 100644 --- a/src/client/app/common/views/components/switch.vue +++ b/src/client/app/common/views/components/switch.vue @@ -87,7 +87,7 @@ export default Vue.extend({ diff --git a/src/client/app/common/views/widgets/calendar.vue b/src/client/app/common/views/widgets/calendar.vue index 03f69a7597..b3b5b3583a 100644 --- a/src/client/app/common/views/widgets/calendar.vue +++ b/src/client/app/common/views/widgets/calendar.vue @@ -109,10 +109,10 @@ export default define({ diff --git a/src/client/app/desktop/ui.styl b/src/client/app/desktop/ui.styl index 5a8d1718e2..a54cafda68 100644 --- a/src/client/app/desktop/ui.styl +++ b/src/client/app/desktop/ui.styl @@ -65,6 +65,20 @@ button.ui background $theme-color border-color $theme-color +html[data-darkmode] button.ui +html[data-darkmode] .button.ui + color #fff + background linear-gradient(to bottom, #313543 0%, #282c37 100%) + border-color #1c2023 + + &:hover + background linear-gradient(to bottom, #2c2f3c 0%, #22262f 100%) + border-color #151a1d + + &:active + background #22262f + border-color #151a1d + input:not([type]).ui input[type='text'].ui input[type='password'].ui diff --git a/src/client/app/desktop/views/components/calendar.vue b/src/client/app/desktop/views/components/calendar.vue index a99b48d195..483a4c718b 100644 --- a/src/client/app/desktop/views/components/calendar.vue +++ b/src/client/app/desktop/views/components/calendar.vue @@ -133,9 +133,9 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index ffa82b9e02..b2dc8a526f 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -374,7 +374,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/components/ui.header.nav.vue b/src/client/app/desktop/views/components/ui.header.nav.vue index 19f72a86d7..0800d96eb6 100644 --- a/src/client/app/desktop/views/components/ui.header.nav.vue +++ b/src/client/app/desktop/views/components/ui.header.nav.vue @@ -99,7 +99,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/widgets/polls.vue b/src/client/app/desktop/views/widgets/polls.vue index 6cb1192c24..42b9c5f25f 100644 --- a/src/client/app/desktop/views/widgets/polls.vue +++ b/src/client/app/desktop/views/widgets/polls.vue @@ -1,16 +1,19 @@ - - %fa:chart-pie%%i18n:@title% - %fa:sync% - - - {{ poll.text }} - %fa:link% - - - %i18n:@nothing% - %fa:spinner .pulse .fw%%i18n:common.loading% + + %fa:chart-pie%%i18n:@title% + %fa:sync% + + + + {{ poll.text }} + %fa:link% + + + %i18n:@nothing% + %fa:spinner .pulse .fw%%i18n:common.loading% + + @@ -60,40 +63,7 @@ export default define({ diff --git a/src/client/app/desktop/views/widgets/profile.vue b/src/client/app/desktop/views/widgets/profile.vue index 1b4b11de3c..0046658b8e 100644 --- a/src/client/app/desktop/views/widgets/profile.vue +++ b/src/client/app/desktop/views/widgets/profile.vue @@ -42,9 +42,9 @@ export default define({
%fa:chart-pie%%i18n:@title%
{{ poll.text }}
%fa:link%
%i18n:@nothing%
%fa:spinner .pulse .fw%%i18n:common.loading%