From dec7d537dca22f60ddc595c7fc34eabaca2c13f1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 14 Jun 2018 20:23:50 +0900 Subject: [PATCH] wip --- .../app/common/views/components/index.ts | 4 + .../app/common/views/components/ui/radio.vue | 120 ++++++++++ .../app/common/views/components/ui/select.vue | 212 ++++++++++++++++++ .../app/common/views/components/ui/switch.vue | 2 +- .../app/mobile/views/pages/settings.vue | 22 +- 5 files changed, 347 insertions(+), 13 deletions(-) create mode 100644 src/client/app/common/views/components/ui/radio.vue create mode 100644 src/client/app/common/views/components/ui/select.vue diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts index 0e20e66f5a..b91008f718 100644 --- a/src/client/app/common/views/components/index.ts +++ b/src/client/app/common/views/components/index.ts @@ -35,6 +35,8 @@ import uiCard from './ui/card.vue'; import uiForm from './ui/form.vue'; import uiTextarea from './ui/textarea.vue'; import uiSwitch from './ui/switch.vue'; +import uiRadio from './ui/radio.vue'; +import uiSelect from './ui/select.vue'; Vue.component('mk-analog-clock', analogClock); Vue.component('mk-menu', menu); @@ -71,3 +73,5 @@ Vue.component('ui-card', uiCard); Vue.component('ui-form', uiForm); Vue.component('ui-textarea', uiTextarea); Vue.component('ui-switch', uiSwitch); +Vue.component('ui-radio', uiRadio); +Vue.component('ui-select', uiSelect); diff --git a/src/client/app/common/views/components/ui/radio.vue b/src/client/app/common/views/components/ui/radio.vue new file mode 100644 index 0000000000..2b7f1d9dd4 --- /dev/null +++ b/src/client/app/common/views/components/ui/radio.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/client/app/common/views/components/ui/select.vue b/src/client/app/common/views/components/ui/select.vue new file mode 100644 index 0000000000..c56ae86159 --- /dev/null +++ b/src/client/app/common/views/components/ui/select.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/src/client/app/common/views/components/ui/switch.vue b/src/client/app/common/views/components/ui/switch.vue index f860309867..2431a76528 100644 --- a/src/client/app/common/views/components/ui/switch.vue +++ b/src/client/app/common/views/components/ui/switch.vue @@ -117,7 +117,7 @@ root(isDark) margin 3px 0 0 0 width 34px height 14px - background isDark ? rgba(#fff, 0.1) : rgba(#000, 0.05) + background isDark ? rgba(#fff, 0.1) : rgba(#000, 0.07) outline none border-radius 14px transition inherit diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue index 25cfbf732b..beac788482 100644 --- a/src/client/app/mobile/views/pages/settings.vue +++ b/src/client/app/mobile/views/pages/settings.vue @@ -36,8 +36,8 @@
%i18n:@post-style%
- %i18n:@post-style-standard% - %i18n:@post-style-smart% + %i18n:@post-style-standard% + %i18n:@post-style-smart%
@@ -68,17 +68,15 @@
%fa:language% %i18n:@lang%
- - - - %i18n:@auto% - + + + + - - {{ x[1] }} - - - + + + + %fa:info-circle% %i18n:@lang-tip%