Compare commits

..

No commits in common. "efa97aaaf30e739be6228c39bef15af42af2f251" and "df6889416d85964ca9b185b1bae928b8ac3359ce" have entirely different histories.

2 changed files with 3 additions and 3 deletions

View File

@ -165,7 +165,7 @@ class DeferredRequirements implements TemplateGlobalProvider
{ {
$external = (mb_strpos($css, '//') === 0 || mb_strpos($css, 'http') === 0); $external = (mb_strpos($css, '//') === 0 || mb_strpos($css, 'http') === 0);
//if (self::getDeferred() && !self::webpackActive()) { //if (self::getDeferred() && !self::webpackActive()) {
if ((self::getDeferred() && !self::webpackActive()) || $external) { if ($external) {
self::$css[] = $css; self::$css[] = $css;
} else { } else {
WebpackTemplateProvider::loadCSS(self::get_url($css)); WebpackTemplateProvider::loadCSS(self::get_url($css));

View File

@ -16,12 +16,12 @@
<% include Header %> <% include Header %>
</header> </header>
<div id="MainContent" class="page-content" data-ajax-region="LayoutAjax"> <main id="MainContent" class="page-content" data-ajax-region="LayoutAjax">
<% if $isFormResponse %> <% if $isFormResponse %>
<%-- Legacy code compatibility --%> <%-- Legacy code compatibility --%>
<% include MainContent Layout=$Layout %> <% include MainContent Layout=$Layout %>
<% end_if %> <% end_if %>
</div> </main>
</div> </div>
<footer id="Footer" class="site-footer footer"> <footer id="Footer" class="site-footer footer">