yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AB#5822 Clean up

Browse Source
This commit is contained in:
Bjarke Berg
2020-03-31 16:43:01 +02:00
parent 6430137fe3
commit e42c63693f
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
View File

@@ -8,7 +8,10 @@
var runtimeMinifier = Current.RuntimeMinifier;
runtimeMinifier.RequiresCss("umbraco", "assets/css/umbraco.css", "lib/bootstrap-social/bootstrap-social.css", "lib/font-awesome/css/font-awesome.min.css");
runtimeMinifier.RequiresCss("umbraco",
"assets/css/umbraco.css",
"lib/bootstrap-social/bootstrap-social.css",
"lib/font-awesome/css/font-awesome.min.css");
}
<!DOCTYPE html>
@@ -21,7 +24,7 @@
<title>Umbraco</title>
@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"));
@Html.Raw(runtimeMinifier.RenderJsHere("umbraco"));
@*Because we're lazy loading angular js, the embedded cloak style will not be loaded initially, but we need it*@
<style>

6
src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
View File

@@ -18,7 +18,10 @@
}
var runtimeMinifier = Current.RuntimeMinifier;
runtimeMinifier.RequiresCss("Umbraco", "lib/bootstrap-social/bootstrap-social.css", "assets/css/umbraco.css", "lib/font-awesome/css/font-awesome.min.css");
runtimeMinifier.RequiresCss("umbraco",
"lib/bootstrap-social/bootstrap-social.css",
"assets/css/umbraco.css",
"lib/font-awesome/css/font-awesome.min.css");
}
<!DOCTYPE html>
@@ -36,7 +39,6 @@
<title ng-bind="$root.locationTitle">Umbraco</title>
@Html.Raw(runtimeMinifier.RenderCssHere("Umbraco"))
@* @Html.RenderCssHere(new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(Current.Configs.Global().UmbracoPath))) *@
</head>
<body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">

5
src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
View File

@@ -6,7 +6,8 @@
var runtimeMinifier = Current.RuntimeMinifier;
runtimeMinifier.RequiresCss("Umbraco", "assets/css/canvasdesigner.css");
runtimeMinifier.RequiresCss("umbraco-preview",
"assets/css/canvasdesigner.css");
}
<!DOCTYPE html>
<html lang="en">
@@ -17,7 +18,7 @@
<meta name="pinterest" content="nopin" />
@Html.Raw(runtimeMinifier.RenderCssHere("Umbraco"))
@Html.Raw(runtimeMinifier.RenderCssHere("umbraco-preview"))
</head>