From a1fff2443464faffaa018d4168ac3ad41d2f1943 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 11 Mar 2022 21:04:45 -0500 Subject: [PATCH] Somegeneralfixesplusnoreportredesign --- webroot/css/weatherscan.css | 41 +++++++++++++++++++-------------- webroot/js/cors.js | 2 +- webroot/js/loops.js | 2 ++ webroot/js/newweathermanager.js | 4 ++-- webroot/js/slides-loop.js | 2 +- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/webroot/css/weatherscan.css b/webroot/css/weatherscan.css index ec2b8d2..dd65649 100644 --- a/webroot/css/weatherscan.css +++ b/webroot/css/weatherscan.css @@ -81,26 +81,28 @@ font-style: normal; } .info-slide .nodata { - transform: translate(0, 60px); + transform: translate(0, 60px) scale(115.25%,100%); + transform-origin: left; position: absolute; white-space: nowrap; - font-family: Frutiger; - padding: 23%; - padding-left: 23.5%; + font-family: 'Frutiger 57 Condensed'; + padding: 22.9%; + padding-left: 20.4%; color: #fff; font-size: 48px; text-shadow: #000 2px 2px 4px; z-index: 2000 } .info-slide .tempunavailable { - transform: translate(0, 60px); + transform: translate(0, 60px) scale(114.5%,100%); + transform-origin: left; position: absolute; white-space: nowrap; - font-family: Frutiger; + font-family: 'Frutiger 57 Condensed'; padding-top: 23.5%; - padding-left: 17.5%; + padding-left: 15%; color: #fff; - font-size: 48px; + font-size: 49px; text-shadow: #000 2px 2px 4px; z-index: 2000 } @@ -108,12 +110,13 @@ transform: translate(0, 0); } .info-slide .noreport { - transform: translate(0, 60px); + transform: translate(0, 60px) scale(114.5%,100%); + transform-origin: left; position: absolute; white-space: nowrap; - font-family: Frutiger; + font-family: 'Frutiger 57 Condensed'; padding-top: 23.5%; - padding-left: 31.4%; + padding-left: 29.65%; color: #fff; font-size: 48px; text-shadow: #000 2px 2px 4px; @@ -5767,15 +5770,19 @@ label{ transform-origin: left; } #current-noreport { - font-family: Interstate; - font-weight: 700; - font-size: 46px; + font-family: 'Interstate2'; + font-weight: 600; + font-size: 44px; position: absolute; - top: 33%; - left: 31%; + top: 45%; + left: 32.4%; text-align: left; width: 66%; - line-height: 200% + line-height: 100%; + letter-spacing: 1.4px; + transform: scale(110%,100%); + text-shadow: .5px 0px #171717; + transform-origin: left; } #minimap-cover { position: absolute; diff --git a/webroot/js/cors.js b/webroot/js/cors.js index a59d701..57a3ce1 100644 --- a/webroot/js/cors.js +++ b/webroot/js/cors.js @@ -1,5 +1,5 @@ // Listen on a specific host via the HOST environment variable -var host = process.env.HOST || '127.0.0.1'; +var host = process.env.HOST || '0.0.0.0'; // Listen on a specific port via the PORT environment variable var port = process.env.PORT || 8081; diff --git a/webroot/js/loops.js b/webroot/js/loops.js index 3599b00..a3d8708 100644 --- a/webroot/js/loops.js +++ b/webroot/js/loops.js @@ -26,6 +26,7 @@ function Loops() { } if (weatherInfo.currentCond.sidebar.noReport == true) { $('#now').fadeOut(0) + $('#nowwide').fadeOut(0) $('#current-temp').fadeOut(0) $('#current-info').fadeOut(0) $('#conditions-icon').fadeOut(0) @@ -37,6 +38,7 @@ function Loops() { if (loopssevereweathermode == false) { displayAtmospheric(0) } else { displaySevereAtmospheric(0) } } $('#now').fadeIn(0) + $('#nowwide').fadeIn(0) $('#current-temp').fadeIn(0) if (loopssevereweathermode == false) { $('#current-info').fadeIn(0) } else { $('#current-info-severe').fadeIn(0); diff --git a/webroot/js/newweathermanager.js b/webroot/js/newweathermanager.js index 39f4d58..63fa285 100644 --- a/webroot/js/newweathermanager.js +++ b/webroot/js/newweathermanager.js @@ -387,7 +387,7 @@ function grabCitySlidesData() { weatherLocscc.icon = ajaxedLoc["v3-wx-observations-current"].iconCode weatherLocscc.humid = ajaxedLoc["v3-wx-observations-current"].relativeHumidity weatherLocscc.dewpt = ajaxedLoc["v3-wx-observations-current"].temperatureDewPoint - weatherLocscc.pressure = ajaxedLoc["v3-wx-observations-current"].pressureAltimeter + weatherLocscc.pressure = (ajaxedLoc["v3-wx-observations-current"].pressureAltimeter).toFixed(2) weatherLocscc.pressureTrend = ((ajaxedLoc["v3-wx-observations-current"].pressureTendencyCode === 1 || ajaxedLoc["v3-wx-observations-current"].pressureTendencyCode === 3) ? '↑' : (ajaxedLoc["v3-wx-observations-current"].pressureTendencyCode === 2 || ajaxedLoc["v3-wx-observations-current"].pressureTendencyCode === 4) ? '↓' : ' S') weatherLocscc.wind = ((ajaxedLoc["v3-wx-observations-current"].windDirectionCardinal == "CALM" || ajaxedLoc["v3-wx-observations-current"].windSpeed == 0) ? 'calm' : ajaxedLoc["v3-wx-observations-current"].windDirectionCardinal) + ' ' + ((ajaxedLoc["v3-wx-observations-current"].windSpeed === 0) ? '' : ajaxedLoc["v3-wx-observations-current"].windSpeed) weatherLocscc.windspeed = ajaxedLoc["v3-wx-observations-current"].windSpeed @@ -595,7 +595,7 @@ function grabSideandLowerBarData() { weatherInfo.currentCond.sidebar.icon = ajaxedLoc["v3-wx-observations-current"].iconCode weatherInfo.currentCond.sidebar.humid = ajaxedLoc["v3-wx-observations-current"].relativeHumidity weatherInfo.currentCond.sidebar.dewpt = ajaxedLoc["v3-wx-observations-current"].temperatureDewPoint - weatherInfo.currentCond.sidebar.pressure = ajaxedLoc["v3-wx-observations-current"].pressureAltimeter + weatherInfo.currentCond.sidebar.pressure = (ajaxedLoc["v3-wx-observations-current"].pressureAltimeter).toFixed(2) weatherInfo.currentCond.sidebar.pressureTrend = ((ajaxedLoc["v3-wx-observations-current"].pressureTendencyCode === 1 || ajaxedLoc["v3-wx-observations-current"].pressureTendencyCode === 3) ? '↑' : (ajaxedLoc["v3-wx-observations-current"].pressureTendencyCode === 2 || ajaxedLoc["v3-wx-observations-current"].pressureTendencyCode === 4) ? '↓' : ' S') weatherInfo.currentCond.sidebar.wind = ((ajaxedLoc["v3-wx-observations-current"].windDirectionCardinal == "CALM" || ajaxedLoc["v3-wx-observations-current"].windSpeed == 0) ? 'calm' : ajaxedLoc["v3-wx-observations-current"].windDirectionCardinal) + ' ' + ((ajaxedLoc["v3-wx-observations-current"].windSpeed === 0) ? '' : ajaxedLoc["v3-wx-observations-current"].windSpeed) weatherInfo.currentCond.sidebar.windspeed = ajaxedLoc["v3-wx-observations-current"].windSpeed diff --git a/webroot/js/slides-loop.js b/webroot/js/slides-loop.js index ca112d4..ddc51c2 100644 --- a/webroot/js/slides-loop.js +++ b/webroot/js/slides-loop.js @@ -1225,7 +1225,7 @@ var mainMap setTimeout(function() { $('.city-slide-intro .weatherscancopyright .copyrighttext').fadeOut(500, function(){ $('.city-slide-intro .weatherscancopyright .copyrighttext').css('font-size','15px') - $('.city-slide-intro .weatherscancopyright .copyrighttext').text("© 2021 Weather Group Television LLC All Rights Reserved") + $('.city-slide-intro .weatherscancopyright .copyrighttext').text(`© ${new Date().getFullYear()} Weather Group Television LLC All Rights Reserved`) }); $('.city-slide-intro .weatherscancopyright .copyrighttext').fadeIn(500); }, 5000);