From cd86d02ae88974ffdb9e3708a519db4c28ccc214 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Jan 2022 09:05:41 +0100 Subject: [PATCH] Refresh bundle css/fonts --- HOME/App_Start/BundleConfig.cs | 7 +++++-- HOME/Content/Site.less | 4 ++-- HOME/Content/site.css | 4 ++-- HOME/Content/site.min.css | 2 +- HOME/Views/Shared/_Layout.cshtml | 11 ++++++----- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/HOME/App_Start/BundleConfig.cs b/HOME/App_Start/BundleConfig.cs index 346ccb3..ad28026 100644 --- a/HOME/App_Start/BundleConfig.cs +++ b/HOME/App_Start/BundleConfig.cs @@ -24,8 +24,11 @@ namespace HOME "~/Scripts/respond.js")); bundles.Add(new StyleBundle("~/Content/css").Include( - "~/Content/bootstrap.css", - "~/Content/site.css")); + "~/Content/font.css", + "~/Content/lib/font-awesome/css/all.css", + "~/Content/site.css", + "~/Content/bootstrap.css" + )); } } } diff --git a/HOME/Content/Site.less b/HOME/Content/Site.less index e73f1d1..e3ed972 100644 --- a/HOME/Content/Site.less +++ b/HOME/Content/Site.less @@ -1,5 +1,5 @@ -@import url('lib/font-awesome/css/all.css'); -@import url('fonts.css'); +/*@import url('lib/font-awesome/css/all.css'); +@import url('fonts.css');*/ h1, h2, h3, h4, h5, h6, b, display-1, display-2, display-3, display-4 { diff --git a/HOME/Content/site.css b/HOME/Content/site.css index 140fe3a..a94c9f8 100644 --- a/HOME/Content/site.css +++ b/HOME/Content/site.css @@ -1,5 +1,5 @@ -@import url('lib/font-awesome/css/all.css'); -@import url('fonts.css'); +/*@import url('lib/font-awesome/css/all.css'); +@import url('fonts.css');*/ h1, h2, h3, diff --git a/HOME/Content/site.min.css b/HOME/Content/site.min.css index bdf3152..626a993 100644 --- a/HOME/Content/site.min.css +++ b/HOME/Content/site.min.css @@ -1 +1 @@ -@import url('lib/font-awesome/css/all.css');@import url('fonts.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif;}html,body{font-family:'Roboto',sans-serif;}body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.dl-horizontal dt{white-space:normal;}input,select,textarea{max-width:280px;}.fullWidth{width:100%;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.navbar{min-height:0;color:#696969;} \ No newline at end of file +h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif;}html,body{font-family:'Roboto',sans-serif;}body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.dl-horizontal dt{white-space:normal;}input,select,textarea{max-width:280px;}.fullWidth{width:100%;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.navbar{min-height:0;color:#696969;} \ No newline at end of file diff --git a/HOME/Views/Shared/_Layout.cshtml b/HOME/Views/Shared/_Layout.cshtml index 2126ce1..b2aaf0a 100644 --- a/HOME/Views/Shared/_Layout.cshtml +++ b/HOME/Views/Shared/_Layout.cshtml @@ -1,11 +1,12 @@  - - - @ViewBag.Title | GPW - @Styles.Render("~/Content/css") - @Scripts.Render("~/bundles/modernizr") + + + @ViewBag.Title | GPW + + @Styles.Render("~/Content/css") + @Scripts.Render("~/bundles/modernizr")