hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 14:56:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert changes did by @mgoleli

Browse Source
This commit is contained in:
Diatrex 2020-04-20 12:26:41 +03:00
parent 30b3a401e0
commit a0d51517de
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
View File

@ -15,16 +15,21 @@
{{ asset_add("theme.js", "visiosoft.theme.base::js/intlTelInput.min.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/intlTelInput.min.js") }}
{{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }}
{{ asset_add("theme.js", "visiosoft.theme.base::js/phoneField.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/phoneField.js") }}
{{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }}
{# Theme Scripts #} {# Theme Scripts #}
{#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#} {#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#}
{{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }}
{{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }}
{{ asset_script("theme.js") }} {{ asset_script("theme.js") }}
{# Include Styles Loaded From Outside #}
<style type="text/css">
{% for style in asset_inlines("styles.css", ["min"]) %}
{{ style|raw }}
{% endfor %}
</style>
{# Include Scripts Loaded From Outside #} {# Include Scripts Loaded From Outside #}
<script type="text/javascript"> <script type="text/javascript">
{% for script in asset_inlines("scripts.js", ["min"]) %} {% for script in asset_inlines("scripts.js", ["min"]) %}
@ -37,10 +42,3 @@
{{ script|raw }} {{ script|raw }}
{% endfor %} {% endfor %}
</script> </script>
{# Include Styles Loaded From Outside #}
<style type="text/css">
{% for style in asset_inlines("styles.css", ["min"]) %}
{{ style|raw }}
{% endfor %}
</style>

21
addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
View File

@ -1,6 +1,9 @@
<!-- Locale --> <!-- Locale -->
<meta http-equiv="Content-Language" content="{{ config('app.locale') }}"> <meta http-equiv="Content-Language" content="{{ config('app.locale') }}">
<!-- VueJS Requirements -->
<meta name="csrf-token" content="{{ csrf_token() }}" />
<!-- To the Future! --> <!-- To the Future! -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@ -10,19 +13,25 @@
{#{{ favicons("theme::img/favicon.png") }}#} {#{{ favicons("theme::img/favicon.png") }}#}
{# Base Theme Components #} {# Base Theme Components #}
{{ asset_add("theme.css", "theme::css/bootstrap.min.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/base.css") }}
{{ asset_add("theme.css", "theme::css/theme.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/bootstrap.min.css") }}
{{ asset_add("theme.css", "theme::css/select2.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/theme.css") }}
{{ asset_add("theme.css", "theme::css/font-awesome.min.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/select2.css") }}
{{ asset_add("theme.css", "visiosoft.theme.base::css/font-awesome.min.css") }}
{{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }}
<script src="{{ asset_path('theme::js/vendor/jquery.min.js') }}"></script> <script src="{{ asset_path('visiosoft.theme.base::js/vendor/jquery.min.js') }}"></script>
{{ asset_style("theme.css") }} {{ asset_style("theme.css") }}
{% include "visiosoft.theme.base::partials/styles" %} {% include "visiosoft.theme.base::partials/styles" %}
{# Custom Theme Components #}
<style type="text/css">
{% for style in asset_inlines("custom-theme.css", ["min"]) %}
{{ style|raw }}
{% endfor %}
</style>
{# Important!! #} {# Important!! #}
{{ constants() }} {{ constants() }}