Merge branch 'release/FixCss'
This commit is contained in:
Samuele Locatelli
@@ -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"
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
|
Before Width: | Height: | Size: 460 KiB After Width: | Height: | Size: 460 KiB |
|
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 107 KiB |
|
Before Width: | Height: | Size: 640 KiB After Width: | Height: | Size: 640 KiB |
|
Before Width: | Height: | Size: 730 KiB After Width: | Height: | Size: 730 KiB |
|
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 141 KiB |
|
Before Width: | Height: | Size: 898 KiB After Width: | Height: | Size: 898 KiB |
@@ -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,
|
||||
|
||||
Vendored
+1
-1
@@ -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;}
|
||||
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;}
|
||||
+46
-46
@@ -172,40 +172,40 @@
|
||||
<Content Include="Content\fonts\lato-v17-latin-regular.svg" />
|
||||
<Content Include="Content\fonts\roboto-condensed-v19-latin-regular.svg" />
|
||||
<Content Include="Content\fonts\roboto-v27-latin-regular.svg" />
|
||||
<Content Include="Content\lib\font-awesome\css\all.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\all.min.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\brands.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\brands.min.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\fontawesome.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\fontawesome.min.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\regular.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\regular.min.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\solid.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\solid.min.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\svg-with-js.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\svg-with-js.min.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\v4-shims.css" />
|
||||
<Content Include="Content\lib\font-awesome\css\v4-shims.min.css" />
|
||||
<Content Include="Content\lib\font-awesome\js\all.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\all.min.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\brands.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\brands.min.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\conflict-detection.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\conflict-detection.min.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\fontawesome.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\fontawesome.min.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\regular.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\regular.min.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\solid.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\solid.min.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\v4-shims.js" />
|
||||
<Content Include="Content\lib\font-awesome\js\v4-shims.min.js" />
|
||||
<Content Include="Content\lib\font-awesome\sprites\brands.svg" />
|
||||
<Content Include="Content\lib\font-awesome\sprites\regular.svg" />
|
||||
<Content Include="Content\lib\font-awesome\sprites\solid.svg" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-brands-400.svg" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-regular-400.svg" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-solid-900.svg" />
|
||||
<Content Include="Content\font-awesome\css\all.css" />
|
||||
<Content Include="Content\font-awesome\css\all.min.css" />
|
||||
<Content Include="Content\font-awesome\css\brands.css" />
|
||||
<Content Include="Content\font-awesome\css\brands.min.css" />
|
||||
<Content Include="Content\font-awesome\css\fontawesome.css" />
|
||||
<Content Include="Content\font-awesome\css\fontawesome.min.css" />
|
||||
<Content Include="Content\font-awesome\css\regular.css" />
|
||||
<Content Include="Content\font-awesome\css\regular.min.css" />
|
||||
<Content Include="Content\font-awesome\css\solid.css" />
|
||||
<Content Include="Content\font-awesome\css\solid.min.css" />
|
||||
<Content Include="Content\font-awesome\css\svg-with-js.css" />
|
||||
<Content Include="Content\font-awesome\css\svg-with-js.min.css" />
|
||||
<Content Include="Content\font-awesome\css\v4-shims.css" />
|
||||
<Content Include="Content\font-awesome\css\v4-shims.min.css" />
|
||||
<Content Include="Content\font-awesome\js\all.js" />
|
||||
<Content Include="Content\font-awesome\js\all.min.js" />
|
||||
<Content Include="Content\font-awesome\js\brands.js" />
|
||||
<Content Include="Content\font-awesome\js\brands.min.js" />
|
||||
<Content Include="Content\font-awesome\js\conflict-detection.js" />
|
||||
<Content Include="Content\font-awesome\js\conflict-detection.min.js" />
|
||||
<Content Include="Content\font-awesome\js\fontawesome.js" />
|
||||
<Content Include="Content\font-awesome\js\fontawesome.min.js" />
|
||||
<Content Include="Content\font-awesome\js\regular.js" />
|
||||
<Content Include="Content\font-awesome\js\regular.min.js" />
|
||||
<Content Include="Content\font-awesome\js\solid.js" />
|
||||
<Content Include="Content\font-awesome\js\solid.min.js" />
|
||||
<Content Include="Content\font-awesome\js\v4-shims.js" />
|
||||
<Content Include="Content\font-awesome\js\v4-shims.min.js" />
|
||||
<Content Include="Content\font-awesome\sprites\brands.svg" />
|
||||
<Content Include="Content\font-awesome\sprites\regular.svg" />
|
||||
<Content Include="Content\font-awesome\sprites\solid.svg" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-brands-400.svg" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-regular-400.svg" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-solid-900.svg" />
|
||||
<Content Include="Content\site.css">
|
||||
<DependentUpon>site.less</DependentUpon>
|
||||
</Content>
|
||||
@@ -227,18 +227,18 @@
|
||||
<Content Include="Content\bootstrap-reboot.css.map" />
|
||||
<Content Include="Content\bootstrap-grid.min.css.map" />
|
||||
<Content Include="Content\bootstrap-grid.css.map" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-brands-400.eot" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-brands-400.ttf" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-brands-400.woff" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-brands-400.woff2" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-regular-400.eot" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-regular-400.ttf" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-regular-400.woff" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-regular-400.woff2" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-solid-900.eot" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-solid-900.ttf" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-solid-900.woff" />
|
||||
<Content Include="Content\lib\font-awesome\webfonts\fa-solid-900.woff2" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-brands-400.eot" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-brands-400.ttf" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-brands-400.woff" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-brands-400.woff2" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-regular-400.eot" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-regular-400.ttf" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-regular-400.woff" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-regular-400.woff2" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-solid-900.eot" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-solid-900.ttf" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-solid-900.woff" />
|
||||
<Content Include="Content\font-awesome\webfonts\fa-solid-900.woff2" />
|
||||
<Content Include="Content\fonts\lato-v17-latin-regular.eot" />
|
||||
<Content Include="Content\fonts\lato-v17-latin-regular.ttf" />
|
||||
<Content Include="Content\fonts\lato-v17-latin-regular.woff" />
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>@ViewBag.Title | GPW</title>
|
||||
@Styles.Render("~/Content/css")
|
||||
@Scripts.Render("~/bundles/modernizr")
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>@ViewBag.Title | GPW</title>
|
||||
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
|
||||
<link href="~/Content/font-awesome/css/all.css" rel="stylesheet" />
|
||||
<link href="~/Content/fonts.min.css" rel="stylesheet" />
|
||||
<link href="~/Content/site.min.css" rel="stylesheet" />
|
||||
@*@Styles.Render("~/Content/iconfonts")*@
|
||||
@Styles.Render("~/Content/css")
|
||||
@Scripts.Render("~/bundles/modernizr")
|
||||
</head>
|
||||
<body>
|
||||
<div class="navbar navbar-expand-lg navbar-dark bg-dark text-light py-1 fixed-top">
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
"libraries": [
|
||||
{
|
||||
"library": "font-awesome@5.15.4",
|
||||
"destination": "Content/lib/font-awesome/"
|
||||
"destination": "Content/font-awesome/"
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user