diff --git a/HOME/App_Start/BundleConfig.cs b/HOME/App_Start/BundleConfig.cs
index 346ccb3..c9083ef 100644
--- a/HOME/App_Start/BundleConfig.cs
+++ b/HOME/App_Start/BundleConfig.cs
@@ -3,29 +3,34 @@ using System.Web.Optimization;
namespace HOME
{
- public class BundleConfig
- {
- // For more information on bundling, visit https://go.microsoft.com/fwlink/?LinkId=301862
- public static void RegisterBundles(BundleCollection bundles)
+ public class BundleConfig
{
- bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
- "~/Scripts/jquery-{version}.js"));
+ // For more information on bundling, visit https://go.microsoft.com/fwlink/?LinkId=301862
+ public static void RegisterBundles(BundleCollection bundles)
+ {
+ bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
+ "~/Scripts/jquery-{version}.js"));
- bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
- "~/Scripts/jquery.validate*"));
+ bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
+ "~/Scripts/jquery.validate*"));
- // Utilizzare la versione di sviluppo di Modernizr per eseguire attività di sviluppo e formazione. Successivamente, quando si è
- // ready for production, use the build tool at https://modernizr.com to pick only the tests you need.
- bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
- "~/Scripts/modernizr-*"));
+ // Utilizzare la versione di sviluppo di Modernizr per eseguire attività di sviluppo e formazione. Successivamente, quando si è
+ // ready for production, use the build tool at https://modernizr.com to pick only the tests you need.
+ bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
+ "~/Scripts/modernizr-*"));
- bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
+ bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
"~/Scripts/bootstrap.js",
"~/Scripts/respond.js"));
- bundles.Add(new StyleBundle("~/Content/css").Include(
- "~/Content/bootstrap.css",
- "~/Content/site.css"));
+ bundles.Add(new StyleBundle("~/Content/css").Include(
+ //"~/Content/font.css",
+ //"~/Content/site.css",
+ "~/Content/bootstrap.css"
+ ));
+ bundles.Add(new StyleBundle("~/Content/iconfonts").Include(
+ "~/Content/font-awesome/css/all.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/lib/font-awesome/css/all.css b/HOME/Content/font-awesome/css/all.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/all.css
rename to HOME/Content/font-awesome/css/all.css
diff --git a/HOME/Content/lib/font-awesome/css/all.min.css b/HOME/Content/font-awesome/css/all.min.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/all.min.css
rename to HOME/Content/font-awesome/css/all.min.css
diff --git a/HOME/Content/lib/font-awesome/css/brands.css b/HOME/Content/font-awesome/css/brands.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/brands.css
rename to HOME/Content/font-awesome/css/brands.css
diff --git a/HOME/Content/lib/font-awesome/css/brands.min.css b/HOME/Content/font-awesome/css/brands.min.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/brands.min.css
rename to HOME/Content/font-awesome/css/brands.min.css
diff --git a/HOME/Content/lib/font-awesome/css/fontawesome.css b/HOME/Content/font-awesome/css/fontawesome.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/fontawesome.css
rename to HOME/Content/font-awesome/css/fontawesome.css
diff --git a/HOME/Content/lib/font-awesome/css/fontawesome.min.css b/HOME/Content/font-awesome/css/fontawesome.min.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/fontawesome.min.css
rename to HOME/Content/font-awesome/css/fontawesome.min.css
diff --git a/HOME/Content/lib/font-awesome/css/regular.css b/HOME/Content/font-awesome/css/regular.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/regular.css
rename to HOME/Content/font-awesome/css/regular.css
diff --git a/HOME/Content/lib/font-awesome/css/regular.min.css b/HOME/Content/font-awesome/css/regular.min.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/regular.min.css
rename to HOME/Content/font-awesome/css/regular.min.css
diff --git a/HOME/Content/lib/font-awesome/css/solid.css b/HOME/Content/font-awesome/css/solid.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/solid.css
rename to HOME/Content/font-awesome/css/solid.css
diff --git a/HOME/Content/lib/font-awesome/css/solid.min.css b/HOME/Content/font-awesome/css/solid.min.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/solid.min.css
rename to HOME/Content/font-awesome/css/solid.min.css
diff --git a/HOME/Content/lib/font-awesome/css/svg-with-js.css b/HOME/Content/font-awesome/css/svg-with-js.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/svg-with-js.css
rename to HOME/Content/font-awesome/css/svg-with-js.css
diff --git a/HOME/Content/lib/font-awesome/css/svg-with-js.min.css b/HOME/Content/font-awesome/css/svg-with-js.min.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/svg-with-js.min.css
rename to HOME/Content/font-awesome/css/svg-with-js.min.css
diff --git a/HOME/Content/lib/font-awesome/css/v4-shims.css b/HOME/Content/font-awesome/css/v4-shims.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/v4-shims.css
rename to HOME/Content/font-awesome/css/v4-shims.css
diff --git a/HOME/Content/lib/font-awesome/css/v4-shims.min.css b/HOME/Content/font-awesome/css/v4-shims.min.css
similarity index 100%
rename from HOME/Content/lib/font-awesome/css/v4-shims.min.css
rename to HOME/Content/font-awesome/css/v4-shims.min.css
diff --git a/HOME/Content/lib/font-awesome/js/all.js b/HOME/Content/font-awesome/js/all.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/all.js
rename to HOME/Content/font-awesome/js/all.js
diff --git a/HOME/Content/lib/font-awesome/js/all.min.js b/HOME/Content/font-awesome/js/all.min.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/all.min.js
rename to HOME/Content/font-awesome/js/all.min.js
diff --git a/HOME/Content/lib/font-awesome/js/brands.js b/HOME/Content/font-awesome/js/brands.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/brands.js
rename to HOME/Content/font-awesome/js/brands.js
diff --git a/HOME/Content/lib/font-awesome/js/brands.min.js b/HOME/Content/font-awesome/js/brands.min.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/brands.min.js
rename to HOME/Content/font-awesome/js/brands.min.js
diff --git a/HOME/Content/lib/font-awesome/js/conflict-detection.js b/HOME/Content/font-awesome/js/conflict-detection.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/conflict-detection.js
rename to HOME/Content/font-awesome/js/conflict-detection.js
diff --git a/HOME/Content/lib/font-awesome/js/conflict-detection.min.js b/HOME/Content/font-awesome/js/conflict-detection.min.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/conflict-detection.min.js
rename to HOME/Content/font-awesome/js/conflict-detection.min.js
diff --git a/HOME/Content/lib/font-awesome/js/fontawesome.js b/HOME/Content/font-awesome/js/fontawesome.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/fontawesome.js
rename to HOME/Content/font-awesome/js/fontawesome.js
diff --git a/HOME/Content/lib/font-awesome/js/fontawesome.min.js b/HOME/Content/font-awesome/js/fontawesome.min.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/fontawesome.min.js
rename to HOME/Content/font-awesome/js/fontawesome.min.js
diff --git a/HOME/Content/lib/font-awesome/js/regular.js b/HOME/Content/font-awesome/js/regular.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/regular.js
rename to HOME/Content/font-awesome/js/regular.js
diff --git a/HOME/Content/lib/font-awesome/js/regular.min.js b/HOME/Content/font-awesome/js/regular.min.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/regular.min.js
rename to HOME/Content/font-awesome/js/regular.min.js
diff --git a/HOME/Content/lib/font-awesome/js/solid.js b/HOME/Content/font-awesome/js/solid.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/solid.js
rename to HOME/Content/font-awesome/js/solid.js
diff --git a/HOME/Content/lib/font-awesome/js/solid.min.js b/HOME/Content/font-awesome/js/solid.min.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/solid.min.js
rename to HOME/Content/font-awesome/js/solid.min.js
diff --git a/HOME/Content/lib/font-awesome/js/v4-shims.js b/HOME/Content/font-awesome/js/v4-shims.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/v4-shims.js
rename to HOME/Content/font-awesome/js/v4-shims.js
diff --git a/HOME/Content/lib/font-awesome/js/v4-shims.min.js b/HOME/Content/font-awesome/js/v4-shims.min.js
similarity index 100%
rename from HOME/Content/lib/font-awesome/js/v4-shims.min.js
rename to HOME/Content/font-awesome/js/v4-shims.min.js
diff --git a/HOME/Content/lib/font-awesome/sprites/brands.svg b/HOME/Content/font-awesome/sprites/brands.svg
similarity index 100%
rename from HOME/Content/lib/font-awesome/sprites/brands.svg
rename to HOME/Content/font-awesome/sprites/brands.svg
diff --git a/HOME/Content/lib/font-awesome/sprites/regular.svg b/HOME/Content/font-awesome/sprites/regular.svg
similarity index 100%
rename from HOME/Content/lib/font-awesome/sprites/regular.svg
rename to HOME/Content/font-awesome/sprites/regular.svg
diff --git a/HOME/Content/lib/font-awesome/sprites/solid.svg b/HOME/Content/font-awesome/sprites/solid.svg
similarity index 100%
rename from HOME/Content/lib/font-awesome/sprites/solid.svg
rename to HOME/Content/font-awesome/sprites/solid.svg
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-brands-400.eot b/HOME/Content/font-awesome/webfonts/fa-brands-400.eot
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-brands-400.eot
rename to HOME/Content/font-awesome/webfonts/fa-brands-400.eot
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-brands-400.svg b/HOME/Content/font-awesome/webfonts/fa-brands-400.svg
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-brands-400.svg
rename to HOME/Content/font-awesome/webfonts/fa-brands-400.svg
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-brands-400.ttf b/HOME/Content/font-awesome/webfonts/fa-brands-400.ttf
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-brands-400.ttf
rename to HOME/Content/font-awesome/webfonts/fa-brands-400.ttf
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-brands-400.woff b/HOME/Content/font-awesome/webfonts/fa-brands-400.woff
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-brands-400.woff
rename to HOME/Content/font-awesome/webfonts/fa-brands-400.woff
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-brands-400.woff2 b/HOME/Content/font-awesome/webfonts/fa-brands-400.woff2
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-brands-400.woff2
rename to HOME/Content/font-awesome/webfonts/fa-brands-400.woff2
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-regular-400.eot b/HOME/Content/font-awesome/webfonts/fa-regular-400.eot
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-regular-400.eot
rename to HOME/Content/font-awesome/webfonts/fa-regular-400.eot
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-regular-400.svg b/HOME/Content/font-awesome/webfonts/fa-regular-400.svg
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-regular-400.svg
rename to HOME/Content/font-awesome/webfonts/fa-regular-400.svg
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-regular-400.ttf b/HOME/Content/font-awesome/webfonts/fa-regular-400.ttf
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-regular-400.ttf
rename to HOME/Content/font-awesome/webfonts/fa-regular-400.ttf
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-regular-400.woff b/HOME/Content/font-awesome/webfonts/fa-regular-400.woff
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-regular-400.woff
rename to HOME/Content/font-awesome/webfonts/fa-regular-400.woff
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-regular-400.woff2 b/HOME/Content/font-awesome/webfonts/fa-regular-400.woff2
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-regular-400.woff2
rename to HOME/Content/font-awesome/webfonts/fa-regular-400.woff2
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-solid-900.eot b/HOME/Content/font-awesome/webfonts/fa-solid-900.eot
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-solid-900.eot
rename to HOME/Content/font-awesome/webfonts/fa-solid-900.eot
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-solid-900.svg b/HOME/Content/font-awesome/webfonts/fa-solid-900.svg
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-solid-900.svg
rename to HOME/Content/font-awesome/webfonts/fa-solid-900.svg
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-solid-900.ttf b/HOME/Content/font-awesome/webfonts/fa-solid-900.ttf
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-solid-900.ttf
rename to HOME/Content/font-awesome/webfonts/fa-solid-900.ttf
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-solid-900.woff b/HOME/Content/font-awesome/webfonts/fa-solid-900.woff
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-solid-900.woff
rename to HOME/Content/font-awesome/webfonts/fa-solid-900.woff
diff --git a/HOME/Content/lib/font-awesome/webfonts/fa-solid-900.woff2 b/HOME/Content/font-awesome/webfonts/fa-solid-900.woff2
similarity index 100%
rename from HOME/Content/lib/font-awesome/webfonts/fa-solid-900.woff2
rename to HOME/Content/font-awesome/webfonts/fa-solid-900.woff2
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/HOME.csproj b/HOME/HOME.csproj
index deadcd6..d836ef9 100644
--- a/HOME/HOME.csproj
+++ b/HOME/HOME.csproj
@@ -172,40 +172,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
site.less
@@ -227,18 +227,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HOME/Views/Shared/_Layout.cshtml b/HOME/Views/Shared/_Layout.cshtml
index 2126ce1..52a7c2c 100644
--- a/HOME/Views/Shared/_Layout.cshtml
+++ b/HOME/Views/Shared/_Layout.cshtml
@@ -1,11 +1,16 @@
-
-
- @ViewBag.Title | GPW
- @Styles.Render("~/Content/css")
- @Scripts.Render("~/bundles/modernizr")
+
+
+ @ViewBag.Title | GPW
+
+
+
+
+ @*@Styles.Render("~/Content/iconfonts")*@
+ @Styles.Render("~/Content/css")
+ @Scripts.Render("~/bundles/modernizr")
diff --git a/HOME/libman.json b/HOME/libman.json
index c5b27b0..858e1e6 100644
--- a/HOME/libman.json
+++ b/HOME/libman.json
@@ -4,7 +4,7 @@
"libraries": [
{
"library": "font-awesome@5.15.4",
- "destination": "Content/lib/font-awesome/"
+ "destination": "Content/font-awesome/"
}
]
}
\ No newline at end of file