diff --git a/NKC_WF/Bundle.config b/NKC_WF/Bundle.config index a8d3637..9b01da3 100644 --- a/NKC_WF/Bundle.config +++ b/NKC_WF/Bundle.config @@ -3,6 +3,7 @@ + \ No newline at end of file diff --git a/NKC_WF/Content/OpenSans.woff b/NKC_WF/Content/OpenSans.woff new file mode 100644 index 0000000..55b25f8 Binary files /dev/null and b/NKC_WF/Content/OpenSans.woff differ diff --git a/NKC_WF/Content/OpenSansCondensed.woff b/NKC_WF/Content/OpenSansCondensed.woff new file mode 100644 index 0000000..aedbd93 Binary files /dev/null and b/NKC_WF/Content/OpenSansCondensed.woff differ diff --git a/NKC_WF/Content/Roboto.woff2 b/NKC_WF/Content/Roboto.woff2 new file mode 100644 index 0000000..de83f9c Binary files /dev/null and b/NKC_WF/Content/Roboto.woff2 differ diff --git a/NKC_WF/Content/RobotoCondensed.woff2 b/NKC_WF/Content/RobotoCondensed.woff2 new file mode 100644 index 0000000..d7ab7af Binary files /dev/null and b/NKC_WF/Content/RobotoCondensed.woff2 differ diff --git a/NKC_WF/Content/Site.css b/NKC_WF/Content/Site.css index ea155ec..39becca 100644 --- a/NKC_WF/Content/Site.css +++ b/NKC_WF/Content/Site.css @@ -1,5 +1,7 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ padding-top: 50px; padding-bottom: 20px; } @@ -9,12 +11,13 @@ body { padding-left: 15px; padding-right: 15px; } -/* Set widths on the form inputs since otherwise they're 100% wide */ -input, -select, -textarea { - max-width: 95%; - /*max-width: 280px;*/ +.textCondens { + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ +} +.textNormal { + font-family: 'Roboto', sans-serif; + /*font-family: 'Open Sans', sans-serif;*/ } /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { @@ -24,6 +27,14 @@ textarea { .body-content { padding: 0; } + body { + font-family: 'Roboto', sans-serif; + } +} +@media (max-width: 992px) { + .container { + width: 100%; + } } .border-thick { border-width: 3px !important; diff --git a/NKC_WF/Content/Site.less b/NKC_WF/Content/Site.less index 37c944d..2171e9e 100644 --- a/NKC_WF/Content/Site.less +++ b/NKC_WF/Content/Site.less @@ -1,5 +1,7 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ padding-top: 50px; padding-bottom: 20px; } @@ -11,12 +13,14 @@ body { padding-right: 15px; } -/* Set widths on the form inputs since otherwise they're 100% wide */ -input, -select, -textarea { - max-width: 95%; - /*max-width: 280px;*/ + +.textCondens { + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ +} +.textNormal { + font-family: 'Roboto', sans-serif; + /*font-family: 'Open Sans', sans-serif;*/ } /* Responsive: Portrait tablets and up */ @@ -28,6 +32,15 @@ textarea { .body-content { padding: 0; } + + body { + font-family: 'Roboto', sans-serif; + } +} +@media (max-width: 992px) { + .container { + width: 100%; + } } @borderThick: 3px; @@ -80,6 +93,7 @@ textarea { .bigText { font-size: 1.3em; } + .smallText { font-size: 0.8em; } @@ -88,57 +102,59 @@ textarea { will truncate terms that are too long to fit in the left column */ .dl-horizontal dt { - white-space: normal; + white-space: normal; } .deleted { - text-decoration: line-through; + text-decoration: line-through; } .padZL { - padding-left: 0.2em; + padding-left: 0.2em; } .padZR { - padding-right: 0.2em; + padding-right: 0.2em; } .padZRL { - .padZL; - .padZR; + .padZL; + .padZR; } .colAlt { - color: #C93; + color: #C93; } -.fontBig{ - font-size:2em; +.fontBig { + font-size: 2em; } -.tNote{ - color: #8a8a8a; - font-style: italic; -} -.tNoWrap{ - white-space: nowrap; +.tNote { + color: #8a8a8a; + font-style: italic; } -.navbar{ - min-height: 0; - /*z-index: 0; // commentare quando in prod?!?*/ - color: #696969; +.tNoWrap { + white-space: nowrap; } -.pagination -{ - margin: 5px 0; + +.navbar { + min-height: 0; + /*z-index: 0; // commentare quando in prod?!?*/ + color: #696969; } -.pageSelDD -{ - width: 6em; + +.pagination { + margin: 5px 0; } -.zeroWidth{ - width: 0; + +.pageSelDD { + width: 6em; +} + +.zeroWidth { + width: 0; } /*------------------------------------------------------------------ @@ -148,104 +164,104 @@ textarea { @blSCut: 20px; .shortcuts { - text-align: center; + text-align: center; } - .shortcuts .shortcut { - min-width: @blSCut * 9; - min-height: @blSCut * 5; - display: inline-block; - padding: @blSCut*2/3 0; - margin: 0 2px 1em; - vertical-align: top; - text-decoration: none; - background: #F3F3F3; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); - background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); - background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); - border: 1px solid #ddd; - box-sizing: border-box; - border-radius: @blSCut/2; - } +.shortcuts .shortcut { + min-width: @blSCut * 9; + min-height: @blSCut * 5; + display: inline-block; + padding: @blSCut*2/3 0; + margin: 0 2px 1em; + vertical-align: top; + text-decoration: none; + background: #F3F3F3; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); + border: 1px solid #ddd; + box-sizing: border-box; + border-radius: @blSCut/2; +} - .shortcuts .shortcut-sm { - min-width: @blSCut * 4.5; - min-height: @blSCut * 3; - display: inline-block; - padding: @blSCut/4 0; - margin: 0 2px 1em; - vertical-align: top; - text-decoration: none; - background: #F3F3F3; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); - background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); - background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); - border: 1px solid #ddd; - box-sizing: border-box; - border-radius: @blSCut/2; - } +.shortcuts .shortcut-sm { + min-width: @blSCut * 4.5; + min-height: @blSCut * 3; + display: inline-block; + padding: @blSCut/4 0; + margin: 0 2px 1em; + vertical-align: top; + text-decoration: none; + background: #F3F3F3; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); + border: 1px solid #ddd; + box-sizing: border-box; + border-radius: @blSCut/2; +} - .shortcuts .shortcut .shortcut-icon { - width: 100%; - margin-top: 0; - margin-bottom: 0; - font-size: @blSCut*2; - color: #333; - } +.shortcuts .shortcut .shortcut-icon { + width: 100%; + margin-top: 0; + margin-bottom: 0; + font-size: @blSCut*2; + color: #333; +} - .shortcuts .shortcut-sm .shortcut-icon { - width: 100%; - margin-top: 0; - margin-bottom: 0; - font-size: @blSCut*2; - color: #333; - } +.shortcuts .shortcut-sm .shortcut-icon { + width: 100%; + margin-top: 0; + margin-bottom: 0; + font-size: @blSCut*2; + color: #333; +} - .shortcuts .shortcut:hover { - background: #E8E8E8; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); - background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); - background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); - background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); - } +.shortcuts .shortcut:hover { + background: #E8E8E8; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); + background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); +} - .shortcuts .shortcut-sm:hover { - background: #E8E8E8; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); - background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); - background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); - background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); - } +.shortcuts .shortcut-sm:hover { + background: #E8E8E8; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); + background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); +} - .shortcuts .shortcut:active { - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - } +.shortcuts .shortcut:active { + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} - .shortcuts .shortcut-sm:active { - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - } +.shortcuts .shortcut-sm:active { + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} - .shortcuts .shortcut:hover .shortcut-icon { - color: #C93; - } +.shortcuts .shortcut:hover .shortcut-icon { + color: #C93; +} - .shortcuts .shortcut-sm:hover .shortcut-icon { - color: #666; - } +.shortcuts .shortcut-sm:hover .shortcut-icon { + color: #666; +} - .shortcuts .shortcut-label { - display: block; - margin-top: .75em; - font-weight: 400; - color: #666; - } +.shortcuts .shortcut-label { + display: block; + margin-top: .75em; + font-weight: 400; + color: #666; +} diff --git a/NKC_WF/Content/Site.min.css b/NKC_WF/Content/Site.min.css index ad3a145..ae1f0e7 100644 --- a/NKC_WF/Content/Site.min.css +++ b/NKC_WF/Content/Site.min.css @@ -1 +1 @@ -body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}input,select,textarea{max-width:95%;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file +body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file diff --git a/NKC_WF/Content/fonts.css b/NKC_WF/Content/fonts.css new file mode 100644 index 0000000..77b5c23 --- /dev/null +++ b/NKC_WF/Content/fonts.css @@ -0,0 +1,24 @@ +@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 diff --git a/NKC_WF/Content/fonts.less b/NKC_WF/Content/fonts.less new file mode 100644 index 0000000..1679aa2 --- /dev/null +++ b/NKC_WF/Content/fonts.less @@ -0,0 +1,27 @@ +@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'); +} diff --git a/NKC_WF/Content/fonts.min.css b/NKC_WF/Content/fonts.min.css new file mode 100644 index 0000000..8b10746 --- /dev/null +++ b/NKC_WF/Content/fonts.min.css @@ -0,0 +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 diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 58081f3..f6ba8f9 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -161,6 +161,12 @@ + + fonts.less + + + fonts.css + @@ -229,6 +235,11 @@ Always + + + + + diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master index b7bbcb2..d0e214d 100644 --- a/NKC_WF/Site.Master +++ b/NKC_WF/Site.Master @@ -46,7 +46,7 @@ -
+
diff --git a/NKC_WF/StackManager.aspx b/NKC_WF/StackManager.aspx index 86ea56d..36302e6 100644 --- a/NKC_WF/StackManager.aspx +++ b/NKC_WF/StackManager.aspx @@ -7,10 +7,9 @@ -
<%: traduci("StackManager") %>
-
+
@@ -20,5 +19,4 @@
-
diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx b/NKC_WF/WebUserControls/cmp_barcode.ascx index 180442a..c5663ef 100644 --- a/NKC_WF/WebUserControls/cmp_barcode.ascx +++ b/NKC_WF/WebUserControls/cmp_barcode.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_barcode.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_barcode" %>
- +
diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx.cs b/NKC_WF/WebUserControls/cmp_barcode.ascx.cs index de9dd17..e82d2c0 100644 --- a/NKC_WF/WebUserControls/cmp_barcode.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_barcode.ascx.cs @@ -11,7 +11,16 @@ namespace NKC_WF.WebUserControls { protected void Page_Load(object sender, EventArgs e) { + if(!Page.IsPostBack) + { + resetMessage(); + } + } + public void resetMessage() + { + lblOutput.Visible = false; + lblOutput.Text = ""; } protected void txtBarcode_TextChanged(object sender, EventArgs e) @@ -40,10 +49,10 @@ namespace NKC_WF.WebUserControls public void showOutput(string cssClass, string messaggio) { // In primis: mostro qualcosa SOLO SE ho del testo - lblError.Visible = (messaggio != ""); - lblError.Text = messaggio; - lblError.Attributes.Remove("class"); - lblError.Attributes.Add("class", cssClass); + lblOutput.Visible = (messaggio != ""); + lblOutput.Text = messaggio; + lblOutput.Attributes.Remove("class"); + lblOutput.Attributes.Add("class", cssClass); } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs index 21be403..7acd04b 100644 --- a/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs @@ -22,12 +22,12 @@ namespace NKC_WF.WebUserControls { protected global::System.Web.UI.WebControls.TextBox txtBarcode; /// - /// Controllo lblError. + /// Controllo lblOutput. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.Label lblError; + protected global::System.Web.UI.WebControls.Label lblOutput; } } diff --git a/NKC_WF/WebUserControls/cmp_footer.ascx b/NKC_WF/WebUserControls/cmp_footer.ascx index 4907248..300ade1 100644 --- a/NKC_WF/WebUserControls/cmp_footer.ascx +++ b/NKC_WF/WebUserControls/cmp_footer.ascx @@ -7,7 +7,7 @@  | 
-
+
 - 
diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx index 30d7a69..da23fc1 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx @@ -15,13 +15,13 @@
NEXT - <%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %> + <%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %>
<%# Eval("SheetIndex") %>
-
<%# Eval("MaterDesc") %>
-
<%# Eval("MaterExtCode") %>
+
<%# Eval("MaterDesc") %>
+
<%# Eval("MaterExtCode") %>
diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs index 37aff0a..2689ba8 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs @@ -96,6 +96,8 @@ namespace NKC_WF.WebUserControls set { hfStackId.Value = value.ToString(); + lastCmd = ""; + cmp_barcode.resetMessage(); repCtrl.DataBind(); } get diff --git a/NKC_WF/compilerconfig.json b/NKC_WF/compilerconfig.json index c28c309..c578945 100644 --- a/NKC_WF/compilerconfig.json +++ b/NKC_WF/compilerconfig.json @@ -6,5 +6,9 @@ { "outputFile": "Content/Site-old.css", "inputFile": "Content/Site-old.less" + }, + { + "outputFile": "Content/fonts.css", + "inputFile": "Content/fonts.less" } ] \ No newline at end of file