From 675e573a8c0ef8e936bc97fed3c6f124fe32bfef Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 4 Nov 2018 14:23:28 +0900 Subject: [PATCH] :art: --- src/client/app/admin/views/announcements.vue | 8 ++-- src/client/app/admin/views/emoji.vue | 44 ++++++++++--------- .../app/common/views/components/index.ts | 4 +- .../views/components/ui/button-group.vue | 21 --------- .../app/common/views/components/ui/button.vue | 12 ++++- .../views/components/ui/horizon-group.vue | 35 +++++++++++++++ .../app/common/views/components/ui/input.vue | 14 +++++- 7 files changed, 88 insertions(+), 50 deletions(-) delete mode 100644 src/client/app/common/views/components/ui/button-group.vue create mode 100644 src/client/app/common/views/components/ui/horizon-group.vue diff --git a/src/client/app/admin/views/announcements.vue b/src/client/app/admin/views/announcements.vue index 347c94c6e..8822b5c33 100644 --- a/src/client/app/admin/views/announcements.vue +++ b/src/client/app/admin/views/announcements.vue @@ -9,10 +9,10 @@ %i18n:@text% - - %fa:save R% %i18n:@save% - %fa:trash-alt R% %i18n:@remove% - + + %fa:save R% %i18n:@save% + %fa:trash-alt R% %i18n:@remove% +
%fa:plus% %i18n:@add% diff --git a/src/client/app/admin/views/emoji.vue b/src/client/app/admin/views/emoji.vue index f7db106a4..ae955e06a 100644 --- a/src/client/app/admin/views/emoji.vue +++ b/src/client/app/admin/views/emoji.vue @@ -3,14 +3,16 @@
%fa:plus% %i18n:@add-emoji.title%
- - %i18n:@add-emoji.name% - %i18n:@add-emoji.name-desc% - - - %i18n:@add-emoji.aliases% - %i18n:@add-emoji.aliases-desc% - + + + %i18n:@add-emoji.name% + %i18n:@add-emoji.name-desc% + + + %i18n:@add-emoji.aliases% + %i18n:@add-emoji.aliases-desc% + + %i18n:@add-emoji.url% @@ -22,21 +24,23 @@
%fa:grin R% %i18n:@emojis.title%
- - %i18n:@add-emoji.name% - %i18n:@add-emoji.name-desc% - - - %i18n:@add-emoji.aliases% - %i18n:@add-emoji.aliases-desc% - + + + %i18n:@add-emoji.name% + %i18n:@add-emoji.name-desc% + + + %i18n:@add-emoji.aliases% + %i18n:@add-emoji.aliases-desc% + + %i18n:@add-emoji.url% - - %fa:save R% %i18n:@emojis.update% - %fa:trash-alt R% %i18n:@emojis.remove% - + + %fa:save R% %i18n:@emojis.update% + %fa:trash-alt R% %i18n:@emojis.remove% +
diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts index 98f781fa9..a3ddf1082 100644 --- a/src/client/app/common/views/components/index.ts +++ b/src/client/app/common/views/components/index.ts @@ -42,7 +42,7 @@ import Reversi from './games/reversi/reversi.vue'; import welcomeTimeline from './welcome-timeline.vue'; import uiInput from './ui/input.vue'; import uiButton from './ui/button.vue'; -import uiButtonGroup from './ui/button-group.vue'; +import uiHorizonGroup from './ui/horizon-group.vue'; import uiCard from './ui/card.vue'; import uiForm from './ui/form.vue'; import uiTextarea from './ui/textarea.vue'; @@ -95,7 +95,7 @@ Vue.component('mk-reversi', Reversi); Vue.component('mk-welcome-timeline', welcomeTimeline); Vue.component('ui-input', uiInput); Vue.component('ui-button', uiButton); -Vue.component('ui-button-group', uiButtonGroup); +Vue.component('ui-horizon-group', uiHorizonGroup); Vue.component('ui-card', uiCard); Vue.component('ui-form', uiForm); Vue.component('ui-textarea', uiTextarea); diff --git a/src/client/app/common/views/components/ui/button-group.vue b/src/client/app/common/views/components/ui/button-group.vue deleted file mode 100644 index 0db3b5ee7..000000000 --- a/src/client/app/common/views/components/ui/button-group.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/src/client/app/common/views/components/ui/button.vue b/src/client/app/common/views/components/ui/button.vue index a50963252..5a898f33d 100644 --- a/src/client/app/common/views/components/ui/button.vue +++ b/src/client/app/common/views/components/ui/button.vue @@ -1,5 +1,10 @@ @@ -7,6 +12,7 @@ + + diff --git a/src/client/app/common/views/components/ui/input.vue b/src/client/app/common/views/components/ui/input.vue index 7e1a16bb3..f624b96e4 100644 --- a/src/client/app/common/views/components/ui/input.vue +++ b/src/client/app/common/views/components/ui/input.vue @@ -1,5 +1,5 @@