diff --git a/MP-MAG/App_Start/BundleConfig.cs b/MP-MAG/App_Start/BundleConfig.cs index 3055d5c..f4f4f22 100644 --- a/MP-MAG/App_Start/BundleConfig.cs +++ b/MP-MAG/App_Start/BundleConfig.cs @@ -42,6 +42,8 @@ namespace MP_MAG bundles.Add(new StyleBundle("~/Content/css").Include( "~/Content/bootstrap.css", + "~/Content/fontawesome.css", + "~/Content/fonts.css", "~/Content/site.css")); // abilito bundle "forzato"! diff --git a/MP-MAG/Content/Site.css b/MP-MAG/Content/Site.css index 1c9e597..2d76acd 100644 --- a/MP-MAG/Content/Site.css +++ b/MP-MAG/Content/Site.css @@ -1,5 +1,6 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { + /*font-family: 'Roboto', sans-serif;*/ font-family: 'Roboto Condensed', sans-serif; /*font-family: 'Open Sans Condensed', sans-serif;*/ padding-top: 50px; diff --git a/MP-MAG/Content/Site.less b/MP-MAG/Content/Site.less index a5d5fb6..3abae6f 100644 --- a/MP-MAG/Content/Site.less +++ b/MP-MAG/Content/Site.less @@ -1,5 +1,6 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { + /*font-family: 'Roboto', sans-serif;*/ font-family: 'Roboto Condensed', sans-serif; /*font-family: 'Open Sans Condensed', sans-serif;*/ padding-top: 50px; diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 588285e..7b50ea6 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -274,6 +274,9 @@ + + ASPXCodeBehind + @@ -289,6 +292,13 @@ Site.Master + + cmp_barcode.ascx + ASPXCodeBehind + + + cmp_barcode.ascx + elencoLotti.aspx ASPXCodeBehind @@ -296,6 +306,27 @@ elencoLotti.aspx + + prtFiniti.aspx + ASPXCodeBehind + + + prtFiniti.aspx + + + prtPedane.aspx + ASPXCodeBehind + + + prtPedane.aspx + + + prtSemilav.aspx + ASPXCodeBehind + + + prtSemilav.aspx + selector.aspx ASPXCodeBehind @@ -338,6 +369,13 @@ cmp_numRow.ascx + + cmp_prtSemilav.ascx + ASPXCodeBehind + + + cmp_prtSemilav.ascx + @@ -366,7 +404,7 @@ - Site.less + site.less Site.css @@ -460,7 +498,11 @@ + + + + @@ -469,6 +511,7 @@ + compilerconfig.json @@ -567,7 +610,7 @@ Web.config - + diff --git a/MP-MAG/SMART/selector.aspx b/MP-MAG/SMART/selector.aspx index 827b128..4329ef5 100644 --- a/MP-MAG/SMART/selector.aspx +++ b/MP-MAG/SMART/selector.aspx @@ -13,17 +13,17 @@
- Elenco Lotti + RICERCA LOTTI - + SEMILAVORATI - + FINITI - + PEDANE diff --git a/MP-MAG/Site.Master b/MP-MAG/Site.Master index e421404..63258b1 100644 --- a/MP-MAG/Site.Master +++ b/MP-MAG/Site.Master @@ -23,7 +23,7 @@ <%: Scripts.Render("~/bundles/modernizr") %> - + @@ -59,7 +59,7 @@
-
+