From 7589ec8f2b35e25619f4337c82335194ec41dff7 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sat, 30 Mar 2019 18:36:01 +0800 Subject: [PATCH] Use buttons from Element UI --- app/Services/OptionForm.php | 2 +- .../assets/src/views/admin/Customization.vue | 4 +- resources/assets/src/views/admin/Market.vue | 31 +++++--- resources/assets/src/views/admin/Players.vue | 26 +++---- resources/assets/src/views/admin/Update.vue | 15 ++-- resources/assets/src/views/admin/Users.vue | 19 ++--- resources/assets/src/views/user/Closet.vue | 23 +++--- resources/assets/src/views/user/Players.vue | 71 ++++++++----------- resources/assets/src/views/user/Profile.vue | 49 +++++-------- .../assets/tests/views/admin/Players.test.ts | 10 ++- .../assets/tests/views/admin/Update.test.ts | 4 +- .../assets/tests/views/admin/Users.test.ts | 19 ++--- .../assets/tests/views/user/Closet.test.ts | 6 +- .../assets/tests/views/user/Players.test.ts | 11 ++- resources/lang/en/admin.yml | 2 +- resources/lang/zh_CN/admin.yml | 2 +- resources/views/admin/update.blade.php | 2 +- resources/views/user/index.blade.php | 2 +- 18 files changed, 144 insertions(+), 154 deletions(-) diff --git a/app/Services/OptionForm.php b/app/Services/OptionForm.php index d82a05c0..1b5cc02c 100644 --- a/app/Services/OptionForm.php +++ b/app/Services/OptionForm.php @@ -148,7 +148,7 @@ class OptionForm 'name' => '', ], $info); - $classes = "btn btn-{$info['style']} ".implode(' ', (array) Arr::get($info, 'class')); + $classes = "el-button el-button--{$info['style']} ".implode(' ', (array) Arr::get($info, 'class')); if ($info['href']) { $this->buttons[] = "{$info['text']}"; diff --git a/resources/assets/src/views/admin/Customization.vue b/resources/assets/src/views/admin/Customization.vue index f1dd7e82..5cc85293 100644 --- a/resources/assets/src/views/admin/Customization.vue +++ b/resources/assets/src/views/admin/Customization.vue @@ -27,7 +27,9 @@ diff --git a/resources/assets/src/views/admin/Market.vue b/resources/assets/src/views/admin/Market.vue index 38d49b5a..db9fd86a 100644 --- a/resources/assets/src/views/admin/Market.vue +++ b/resources/assets/src/views/admin/Market.vue @@ -30,9 +30,10 @@ - + diff --git a/resources/assets/src/views/admin/Players.vue b/resources/assets/src/views/admin/Players.vue index 21382b31..9c29d52a 100644 --- a/resources/assets/src/views/admin/Players.vue +++ b/resources/assets/src/views/admin/Players.vue @@ -46,18 +46,17 @@ -