Bug fixes

This commit is contained in:
Diatrex 2020-05-01 09:26:36 +03:00
parent 8ae34a5162
commit 7316045e74
3 changed files with 9 additions and 8 deletions

View File

@ -1,5 +1,9 @@
{% extends "theme::layouts/default" %} {% extends "theme::layouts/default" %}
{% block styles %}
{{ asset_style('visiosoft.theme.base::css/login.css') }}
{% endblock %}
{% block content %} {% block content %}
{% set phoneLogin = not setting_value('visiosoft.module.advs::register_email_field') or app.request.get('type') == 'phone' %} {% set phoneLogin = not setting_value('visiosoft.module.advs::register_email_field') or app.request.get('type') == 'phone' %}
<div class="row justify-content-center"> <div class="row justify-content-center">
@ -97,5 +101,4 @@
</div> </div>
</div> </div>
{{ asset_add('scripts.js','visiosoft.theme.base::js/login.js') }} {{ asset_add('scripts.js','visiosoft.theme.base::js/login.js') }}
{{ asset_add('styles.css','visiosoft.theme.base::css/login.css') }}
{% endblock %} {% endblock %}

View File

@ -1,5 +1,9 @@
{% extends "theme::layouts/default" %} {% extends "theme::layouts/default" %}
{% block styles %}
{{ asset_style('visiosoft.theme.base::css/register.css') }}
{% endblock %}
{% block content %} {% block content %}
<div class="py-4"> <div class="py-4">
<div class="row justify-content-center bg-light rounded border px-3"> <div class="row justify-content-center bg-light rounded border px-3">
@ -24,12 +28,8 @@
<i class="fas fa-user-plus"></i> <i class="fas fa-user-plus"></i>
{{ trans('visiosoft.theme.base::button.register') }} {{ trans('visiosoft.theme.base::button.register') }}
</button> </button>
</div> </div>
</div> </div>
<div class="social-login py-2 row col-12 m-0">
{{ addBlock('login/oauth')|raw }}
</div>
{{ form_close() }} {{ form_close() }}
</div> </div>
@ -72,9 +72,6 @@
</div> </div>
</div> </div>
{{ asset_add("styles.css", "visiosoft.theme.base::css/register.css") }}
{{ asset_add("scripts.js", "visiosoft.theme.base::js/register.js") }} {{ asset_add("scripts.js", "visiosoft.theme.base::js/register.js") }}
{% endblock %} {% endblock %}

View File

@ -14,4 +14,5 @@ let mix = require('laravel-mix');
mix mix
.js('resources/assets/js/app.js', 'public/js') .js('resources/assets/js/app.js', 'public/js')
.js('addons/default/visiosoft/*/resources/js/vue/app.js', 'public/js') .js('addons/default/visiosoft/*/resources/js/vue/app.js', 'public/js')
.js('core/visiosoft/*/resources/js/vue/app.js', 'public/js')
.sass('resources/assets/sass/app.scss', 'public/css'); .sass('resources/assets/sass/app.scss', 'public/css');