Browse Source

Merge 2bb8c7f312 into b835ce7362

pull/11/merge
Ned Zimmerman 8 years ago committed by GitHub
parent
commit
180e85f91b
  1. 31
      app/setup.php
  2. 4
      resources/views/layouts/app.blade.php

31
app/setup.php

@ -14,6 +14,37 @@ add_action('wp_enqueue_scripts', function () {
$webfonts = 'https://fonts.googleapis.com/css?family=Karla:400,400i,700|Spectral:400,400i,600';
wp_enqueue_style('aldine/webfonts', $webfonts, false, null);
wp_enqueue_style('aldine/main.css', asset_path('styles/main.css'), false, null);
wp_enqueue_style(
'uio/normalize.css',
get_theme_file_uri() . '/lib/infusion/src/lib/normalize/css/normalize.css',
false,
null
);
wp_enqueue_style(
'uio/fluid.css',
get_theme_file_uri() . '/lib/infusion/src/framework/core/css/fluid.css',
false,
null
);
wp_enqueue_style(
'uio/enactors.css',
get_theme_file_uri() . '/lib/infusion/src/framework/preferences/css/Enactors.css',
false,
null
);
wp_enqueue_style(
'uio/prefseditor.css',
get_theme_file_uri() . '/lib/infusion/src/framework/preferences/css/PrefsEditor.css',
false,
null
);
wp_enqueue_style(
'uio/separatedpanelprefseditor.css',
get_theme_file_uri() . '/lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditor.css',
false,
null
);
wp_enqueue_script('uio.js', get_theme_file_uri() . '/lib/infusion/infusion-uiOptions.js', ['jquery'], null, true);
wp_enqueue_script('aldine/main.js', asset_path('scripts/main.js'), ['jquery'], null, true);
wp_localize_script('aldine/main.js', 'SAGE_DIST_PATH', get_theme_file_uri() . '/dist/');
}, 100);

4
resources/views/layouts/app.blade.php

@ -2,7 +2,7 @@
<html @php(language_attributes())>
@include('partials.head')
<body @php(body_class('no-js'))>
{{-- @include('partials.uio') --}}
@include('partials.uio')
@php(do_action('get_header'))
@include('partials.header')
<div class="wrap container" role="document">
@ -15,6 +15,6 @@
@php(do_action('get_footer'))
@include('partials.footer')
@php(wp_footer())
{{-- @include('partials.uio-script') --}}
@include('partials.uio-script')
</body>
</html>

Loading…
Cancel
Save