diff --git a/MP-ADM/WebUserControls/cmp_planStats.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats.ascx.cs index 9b5901e4..19a4703b 100644 --- a/MP-ADM/WebUserControls/cmp_planStats.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats.ascx.cs @@ -155,8 +155,8 @@ namespace MP_ADM.WebUserControls protected void lbtForceReload_Click(object sender, EventArgs e) { // chiamo stored x importazione... - DataLayerObj.taArcaGiac.stp_IMP_All_Import_Process(null, 365, 31, null); - DataLayerObj.taArcaGiac.stp_IMP_All_Ordini_Process(null, 365, 31, "ALL", false); + DataLayerObj.taArcaGiac.stp_IMP_All_Import_Process(null, null, null, null); + DataLayerObj.taArcaGiac.stp_IMP_All_Ordini_Process(null, null, null, null, null); } protected void lbtToggle_Click(object sender, EventArgs e) diff --git a/MP-LAND/App_Start/BundleConfig.cs b/MP-LAND/App_Start/BundleConfig.cs index 274a2144..d70f264a 100644 --- a/MP-LAND/App_Start/BundleConfig.cs +++ b/MP-LAND/App_Start/BundleConfig.cs @@ -24,10 +24,12 @@ namespace MP "~/Scripts/bootstrap.js", "~/Scripts/respond.js")); + bundles.Add(new StyleBundle("~/Content/bootstrap").Include( + "~/Content/bootstrap.css")); + bundles.Add(new StyleBundle("~/Content/css").Include( - "~/Content/bootstrap.css", "~/Content/font-awesome.css", - //"~/Content/font.css", + "~/Content/fonts.css", "~/Content/Site.css")); } diff --git a/MP-LAND/Content/Site.css b/MP-LAND/Content/Site.css index 6acd5160..df8d2bf9 100644 --- a/MP-LAND/Content/Site.css +++ b/MP-LAND/Content/Site.css @@ -1,4 +1,4 @@ -@import "font.css"; +/*@import "font.css";*/ body { padding-top: 50px; padding-bottom: 20px; diff --git a/MP-LAND/Content/Site.less b/MP-LAND/Content/Site.less index 9e6ef661..02551921 100644 --- a/MP-LAND/Content/Site.less +++ b/MP-LAND/Content/Site.less @@ -1,4 +1,4 @@ -@import "font.css"; +/*@import "font.css";*/ body { padding-top: 50px; diff --git a/MP-LAND/Content/Site.min.css b/MP-LAND/Content/Site.min.css index c407019b..c20abe5c 100644 --- a/MP-LAND/Content/Site.min.css +++ b/MP-LAND/Content/Site.min.css @@ -1 +1 @@ -@import"font.css";body{padding-top:50px;padding-bottom:20px;font-family:"Roboto Condensed";}.body-content{padding-left:15px;padding-right:15px;}.dl-horizontal dt{white-space:normal;}input,select,textarea{max-width:280px;}.fullWidth{width:100%;}.text-white{color:#fff;}.text-gray{color:#696969;}.userCard{display:block;page-break-before:auto;page-break-inside:avoid;page-break-after:auto;}@page{margin:1cm;}@media print{.userCard{display:block;page-break-before:always;}} \ No newline at end of file +body{padding-top:50px;padding-bottom:20px;font-family:"Roboto Condensed";}.body-content{padding-left:15px;padding-right:15px;}.dl-horizontal dt{white-space:normal;}input,select,textarea{max-width:280px;}.fullWidth{width:100%;}.text-white{color:#fff;}.text-gray{color:#696969;}.userCard{display:block;page-break-before:auto;page-break-inside:avoid;page-break-after:auto;}@page{margin:1cm;}@media print{.userCard{display:block;page-break-before:always;}} \ No newline at end of file diff --git a/MP-LAND/Content/fonts.css b/MP-LAND/Content/fonts.css index 77b5c234..8c53b13f 100644 --- a/MP-LAND/Content/fonts.css +++ b/MP-LAND/Content/fonts.css @@ -2,23 +2,23 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; - src: url('OpenSans.woff') format('woff'); + src: url('../fonts/OpenSans.woff') format('woff'); } @font-face { font-family: 'Open Sans Condensed'; font-style: normal; font-weight: 300; - src: url('OpenSansCondensed.woff') format('woff'); + src: url('../fonts/OpenSansCondensed.woff') format('woff'); } @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: url('Roboto.woff2') format('woff2'); + src: url('../fonts/Roboto.woff2') format('woff2'); } @font-face { font-family: 'Roboto Condensed'; font-style: normal; font-weight: 300; - src: url('RobotoCondensed.woff2') format('woff2'); + src: url('../fonts/RobotoCondensed.woff2') format('woff2'); } \ No newline at end of file diff --git a/MP-LAND/Content/fonts.less b/MP-LAND/Content/fonts.less index 1679aa26..bd8299b1 100644 --- a/MP-LAND/Content/fonts.less +++ b/MP-LAND/Content/fonts.less @@ -1,27 +1,27 @@ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: url('OpenSans.woff') format('woff'); + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url('../fonts/OpenSans.woff') format('woff'); } @font-face { - font-family: 'Open Sans Condensed'; - font-style: normal; - font-weight: 300; - src: url('OpenSansCondensed.woff') format('woff'); + font-family: 'Open Sans Condensed'; + font-style: normal; + font-weight: 300; + src: url('../fonts/OpenSansCondensed.woff') format('woff'); } @font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: url('Roboto.woff2') format('woff2'); + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('../fonts/Roboto.woff2') format('woff2'); } @font-face { - font-family: 'Roboto Condensed'; - font-style: normal; - font-weight: 300; - src: url('RobotoCondensed.woff2') format('woff2'); -} + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 300; + src: url('../fonts/RobotoCondensed.woff2') format('woff2'); +} \ No newline at end of file diff --git a/MP-LAND/Content/fonts.min.css b/MP-LAND/Content/fonts.min.css index 8b107467..223a8378 100644 --- a/MP-LAND/Content/fonts.min.css +++ b/MP-LAND/Content/fonts.min.css @@ -1 +1 @@ -@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('RobotoCondensed.woff2') format('woff2');} \ No newline at end of file +@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('../fonts/OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('../fonts/OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('../fonts/Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('../fonts/RobotoCondensed.woff2') format('woff2');} \ No newline at end of file diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj index c3049ee1..6f190a17 100644 --- a/MP-LAND/MP-LAND.csproj +++ b/MP-LAND/MP-LAND.csproj @@ -368,16 +368,16 @@ - + Always - + Always - + Always - + Always diff --git a/MP-LAND/Views/Shared/_Layout.cshtml b/MP-LAND/Views/Shared/_Layout.cshtml index 67be69b9..5c93e0af 100644 --- a/MP-LAND/Views/Shared/_Layout.cshtml +++ b/MP-LAND/Views/Shared/_Layout.cshtml @@ -5,6 +5,7 @@ @ViewBag.Title - MP LAND + @Styles.Render("~/Content/bootstrap") @Styles.Render("~/Content/css") @Scripts.Render("~/bundles/modernizr") diff --git a/MP-LAND/Content/OpenSans.woff b/MP-LAND/fonts/OpenSans.woff similarity index 100% rename from MP-LAND/Content/OpenSans.woff rename to MP-LAND/fonts/OpenSans.woff diff --git a/MP-LAND/Content/OpenSansCondensed.woff b/MP-LAND/fonts/OpenSansCondensed.woff similarity index 100% rename from MP-LAND/Content/OpenSansCondensed.woff rename to MP-LAND/fonts/OpenSansCondensed.woff diff --git a/MP-LAND/Content/Roboto.woff2 b/MP-LAND/fonts/Roboto.woff2 similarity index 100% rename from MP-LAND/Content/Roboto.woff2 rename to MP-LAND/fonts/Roboto.woff2 diff --git a/MP-LAND/Content/RobotoCondensed.woff2 b/MP-LAND/fonts/RobotoCondensed.woff2 similarity index 100% rename from MP-LAND/Content/RobotoCondensed.woff2 rename to MP-LAND/fonts/RobotoCondensed.woff2