diff --git a/resources/assets/src/js/layout.js b/resources/assets/src/js/layout.js index 835ff334..59595a75 100644 --- a/resources/assets/src/js/layout.js +++ b/resources/assets/src/js/layout.js @@ -1,28 +1,14 @@ import 'bootstrap' // eslint-disable-line import/no-extraneous-dependencies import 'admin-lte' -import 'icheck' import Vue from 'vue' Vue.mixin({ mounted() { - $(this.$el).iCheck({ - radioClass: 'iradio_square-blue', - checkboxClass: 'icheckbox_square-blue', - }) - .on('ifChecked ifUnchecked', function onChange() { - // eslint-disable-next-line no-invalid-this - $(this)[0].dispatchEvent(new Event('change')) - }) $('[data-toggle="tooltip"]').tooltip() }, }) document.addEventListener('loadend', () => { - $('input').iCheck({ - radioClass: 'iradio_square-blue', - checkboxClass: 'icheckbox_square-blue', - }) - $('[data-toggle="tooltip"]').tooltip() }) diff --git a/resources/assets/src/views/auth/Login.vue b/resources/assets/src/views/auth/Login.vue index c43efa23..6fe00048 100644 --- a/resources/assets/src/views/auth/Login.vue +++ b/resources/assets/src/views/auth/Login.vue @@ -28,11 +28,7 @@ <div class="row"> <div class="col-xs-6"> - <div class="checkbox icheck" style="margin-top: 0;"> - <label> - <input v-model="remember" type="checkbox"> {{ $t('auth.keep') }} - </label> - </div> + <el-switch v-model="remember" :active-text="$t('auth.keep')" /> </div> <div class="col-xs-6"> <a v-t="'auth.forgot-link'" class="pull-right" :href="`${baseUrl}/auth/forgot`" /> @@ -41,16 +37,12 @@ <div class="row"> <div class="col-xs-12"> - <button v-if="pending" disabled class="btn btn-primary btn-block btn-flat"> - <i class="fa fa-spinner fa-spin" /> {{ $t('auth.loggingIn') }} - </button> - <button - v-else - class="btn btn-primary btn-block btn-flat" - type="submit" - > - {{ $t('auth.login') }} - </button> + <el-button type="primary" native-type="submit" :disabled="pending"> + <template v-if="pending"> + <i class="fa fa-spinner fa-spin" /> {{ $t('auth.loggingIn') }} + </template> + <span v-else>{{ $t('auth.login') }}</span> + </el-button> </div> </div> </form> @@ -136,4 +128,8 @@ export default { <style lang="stylus"> #login-button margin-top 5px + +.el-button + margin-top 10px + width 100% </style>