diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index d082028..25f5148 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/Content/WebSCR.css b/WebSCR/Content/WebSCR.css index d64e8b4..3f6b68f 100644 --- a/WebSCR/Content/WebSCR.css +++ b/WebSCR/Content/WebSCR.css @@ -174,7 +174,7 @@ left: 2px; right: 0px; padding: 2px; - font-size: 12px; + font-size: 9px; } .calendar_white_shadow_inner { background-color: #666666; diff --git a/WebSCR/Content/WebSCR.less b/WebSCR/Content/WebSCR.less index 47f8fed..92ffdae 100644 --- a/WebSCR/Content/WebSCR.less +++ b/WebSCR/Content/WebSCR.less @@ -280,7 +280,7 @@ padding: 2px; - font-size: 12px; + font-size: 9px; } .calendar_white_shadow_inner diff --git a/WebSCR/Content/WebSCR.min.css b/WebSCR/Content/WebSCR.min.css index 2161cc7..bc0eaac 100644 --- a/WebSCR/Content/WebSCR.min.css +++ b/WebSCR/Content/WebSCR.min.css @@ -1 +1 @@ -.greenBox{background-color:#c3ffc3;border:1px solid #00a400;color:#333}.yellowBox{background-color:#ffffb6;border:1px solid #b1b100;color:#333}.orangeBox{background-color:#ffa05b;border:1px solid #be5100;color:#333}.redBox{background-color:#ff9c9c;border:1px solid #cb0000;color:#333}.grayBox{background-color:#d6d6d6;border:1px solid #707070;color:#333}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.flLeft{float:left}.calendar_white_main{border:1px solid #999}.calendar_white_scroll_up{background:url(calendar_white/up.png)}.calendar_white_scroll_down{background:url(calendar_white/down.png)}.calendar_white_rowheader_inner,.calendar_white_cornerright_inner,.calendar_white_corner_inner,.calendar_white_colheader_inner,.calendar_white_alldayheader_inner{color:#666;background:#eee;background:-moz-linear-gradient(top,#eee 0%,#ddd);background:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#ddd));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#eeeeee",endColorStr="#dddddd")}.calendar_white_cornerright_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-bottom:1px solid #999}.calendar_white_rowheader_inner{font-size:16pt;text-align:right;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_corner_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_rowheader_minutes{font-size:10px;vertical-align:super;padding-left:2px;padding-right:2px}.calendar_white_colheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_cell_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background-color:#fff}.calendar_white_alldayheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_message{opacity:.9;filter:alpha(opacity=90);padding:10px;color:#fff;background:#ffa216;background:-moz-linear-gradient(top,#ffa216 0%,#ff8400);background:-webkit-gradient(linear,left top,left bottom,from(#ffa216),to(#ff8400));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffa216",endColorStr="#ff8400")}.calendar_white_alldayevent_inner,.calendar_white_event_inner{color:#666;background:#fff;background:-moz-linear-gradient(top,#fff 0%,#eee);background:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#eee));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffffff",endColorStr="#eeeeee");border:1px solid #999;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;-moz-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);-webkit-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8)}.calendar_white_selected .calendar_white_event_inner{background:#ddd}.calendar_white_alldayevent_inner{position:absolute;top:2px;bottom:2px;left:2px;right:1px;padding:2px;margin-right:1px;font-size:12px}.calendar_white_event_withheader .calendar_white_event_inner{padding-top:15px}.calendar_white_event{cursor:default}.calendar_white_event_inner{position:absolute;overflow:hidden;top:0;bottom:2px;left:2px;right:0;padding:2px;font-size:12px}.calendar_white_shadow_inner{background-color:#666;opacity:.5;filter:alpha(opacity=70);height:100%;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.div_1_3{width:33%}.div_2_3{width:66%}.div_1_2{width:50%}.div_1_4{width:25%}.div_3_4{width:75%}.div_1_5{width:20%}.div_2_5{width:40%}.div_3_5{width:60%}.div_4_5{width:80%} \ No newline at end of file +.greenBox{background-color:#c3ffc3;border:1px solid #00a400;color:#333}.yellowBox{background-color:#ffffb6;border:1px solid #b1b100;color:#333}.orangeBox{background-color:#ffa05b;border:1px solid #be5100;color:#333}.redBox{background-color:#ff9c9c;border:1px solid #cb0000;color:#333}.grayBox{background-color:#d6d6d6;border:1px solid #707070;color:#333}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.flLeft{float:left}.calendar_white_main{border:1px solid #999}.calendar_white_scroll_up{background:url(calendar_white/up.png)}.calendar_white_scroll_down{background:url(calendar_white/down.png)}.calendar_white_rowheader_inner,.calendar_white_cornerright_inner,.calendar_white_corner_inner,.calendar_white_colheader_inner,.calendar_white_alldayheader_inner{color:#666;background:#eee;background:-moz-linear-gradient(top,#eee 0%,#ddd);background:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#ddd));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#eeeeee",endColorStr="#dddddd")}.calendar_white_cornerright_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-bottom:1px solid #999}.calendar_white_rowheader_inner{font-size:16pt;text-align:right;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_corner_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_rowheader_minutes{font-size:10px;vertical-align:super;padding-left:2px;padding-right:2px}.calendar_white_colheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_cell_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background-color:#fff}.calendar_white_alldayheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_message{opacity:.9;filter:alpha(opacity=90);padding:10px;color:#fff;background:#ffa216;background:-moz-linear-gradient(top,#ffa216 0%,#ff8400);background:-webkit-gradient(linear,left top,left bottom,from(#ffa216),to(#ff8400));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffa216",endColorStr="#ff8400")}.calendar_white_alldayevent_inner,.calendar_white_event_inner{color:#666;background:#fff;background:-moz-linear-gradient(top,#fff 0%,#eee);background:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#eee));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffffff",endColorStr="#eeeeee");border:1px solid #999;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;-moz-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);-webkit-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8)}.calendar_white_selected .calendar_white_event_inner{background:#ddd}.calendar_white_alldayevent_inner{position:absolute;top:2px;bottom:2px;left:2px;right:1px;padding:2px;margin-right:1px;font-size:12px}.calendar_white_event_withheader .calendar_white_event_inner{padding-top:15px}.calendar_white_event{cursor:default}.calendar_white_event_inner{position:absolute;overflow:hidden;top:0;bottom:2px;left:2px;right:0;padding:2px;font-size:9px}.calendar_white_shadow_inner{background-color:#666;opacity:.5;filter:alpha(opacity=70);height:100%;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.div_1_3{width:33%}.div_2_3{width:66%}.div_1_2{width:50%}.div_1_4{width:25%}.div_3_4{width:75%}.div_1_5{width:20%}.div_2_5{width:40%}.div_3_5{width:60%}.div_4_5{width:80%} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx index c3dbf6f..f64e1c2 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx +++ b/WebSCR/WebUserControls/mod_giornata.ascx @@ -53,7 +53,8 @@ OnEventClick="DayPilotCalendar1_EventClick" Width="95%" HourFontSize="6" - EventFontSize="8pt" Days="7"> + DayFontSize="8pt" + EventFontSize="7pt" Days="7"> diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index ae29a2f..da54507 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index afd275c..7b5018a 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 8e56b22..1be423d 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index ae29a2f..da54507 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 8e56b22..1be423d 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 4a37193..b36be51 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 8e56b22..1be423d 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ