diff --git a/web/app/assets/javascripts/networkTestHelper.js b/web/app/assets/javascripts/networkTestHelper.js index b5f2e1855..3014a6237 100644 --- a/web/app/assets/javascripts/networkTestHelper.js +++ b/web/app/assets/javascripts/networkTestHelper.js @@ -329,7 +329,7 @@ else if(isWireless == 1) { context.JK.Banner.showAlert({buttons: [ {name: 'CANCEL', click: function() {}}, - {name: 'RUN NETWORK TEST ANYWAY', click: function() {startNetworkTest(false)}} ], + {name: 'RUN NETWORK TEST ANYWAY', click: function() {startNetworkTest(false)}}], html: "
It appears that your computer is connected to your network using WiFi.
" + "We strongly advise against running the JamKazam application on a WiFi connection. " + "We recommend using a wired Ethernet connection from your computer to your router. " + diff --git a/web/app/assets/stylesheets/client/client.css b/web/app/assets/stylesheets/client/client.css index 0fe1feba3..c3e6145f4 100644 --- a/web/app/assets/stylesheets/client/client.css +++ b/web/app/assets/stylesheets/client/client.css @@ -9,6 +9,7 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self + *= require jquery.ui.datepicker *= require ./ie *= require jquery.bt *= require easydropdown diff --git a/web/app/assets/stylesheets/client/jquery-ui-overrides.css.scss b/web/app/assets/stylesheets/client/jquery-ui-overrides.css.scss index 6852495c4..d066cf241 100644 --- a/web/app/assets/stylesheets/client/jquery-ui-overrides.css.scss +++ b/web/app/assets/stylesheets/client/jquery-ui-overrides.css.scss @@ -1,6 +1,6 @@ /* DatePicker Container */ .ui-datepicker { - width: 216px; + width: 254px; height: auto; margin: 5px auto 0; font: 9pt Arial, sans-serif; @@ -18,12 +18,12 @@ .ui-datepicker-header { // background: url('../img/dark_leather.png') repeat 0 0 #000; background-color: #7e7e7e; - color: #e0e0e0; + color: #333; font-weight: bold; -webkit-box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2); -moz-box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2); box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2); - text-shadow: 1px -1px 0px #000; + //text-shadow: 1px -1px 0px #000; filter: dropshadow(color=#000, offx=1, offy=-1); line-height: 30px; border-width: 1px 0 0 0; @@ -68,8 +68,8 @@ text-transform: uppercase; font-size: 6pt; padding: 5px 0; - color: #666666; - text-shadow: 1px 0px 0px #fff; + color: #ccc; + //text-shadow: 1px 0px 0px #fff; filter: dropshadow(color=#fff, offx=1, offy=0); } .ui-datepicker tbody td { @@ -97,14 +97,14 @@ filter: dropshadow(color=#fff, offx=1, offy=1); } .ui-datepicker-calendar .ui-state-default { - background: #4e4e4e; - background: -moz-linear-gradient(top, #4e4e4e 0%, #0e0e0e 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(100%,#dedede)); - background: -webkit-linear-gradient(top, #4e4e4e 0%,#0e0e0e 100%); - background: -o-linear-gradient(top, #4e4e4e 0%,#0e0e0e 100%); - background: -ms-linear-gradient(top, #4e4e4e 0%,#0e0e0e 100%); - background: linear-gradient(top, #4e4e4e 0%,#0e0e0e 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#dedede',GradientType=0 ); + //background: #4e4e4e; + //background: -moz-linear-gradient(top, #4e4e4e 0%, #0e0e0e 100%); + //background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(100%,#dedede)); + //background: -webkit-linear-gradient(top, #4e4e4e 0%,#0e0e0e 100%); + //background: -o-linear-gradient(top, #4e4e4e 0%,#0e0e0e 100%); + //background: -ms-linear-gradient(top, #4e4e4e 0%,#0e0e0e 100%); + //background: linear-gradient(top, #4e4e4e 0%,#0e0e0e 100%); + //filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#dedede',GradientType=0 ); -webkit-box-shadow: inset 1px 1px 0px 0px rgba(250, 250, 250, .5); -moz-box-shadow: inset 1px 1px 0px 0px rgba(250, 250, 250, .5); box-shadow: inset 1px 1px 0px 0px rgba(250, 250, 250, .5); @@ -124,6 +124,7 @@ position: relative; margin: -1px; } + .ui-datepicker-unselectable .ui-state-default { background: #4e4e4e; color: #b4b3b3;