diff --git a/webroot/css/weatherscan.css b/webroot/css/weatherscan.css index 7137317..7d5002a 100644 --- a/webroot/css/weatherscan.css +++ b/webroot/css/weatherscan.css @@ -32,6 +32,12 @@ @font-face { font-family: Interstate; src: url(/fonts/newfonts/Interstate-Regular.woff) format("woff"); + font-weight: 400 500; + font-style: normal +} +@font-face { + font-family: 'Interstate2'; + src: url(/fonts/newfonts/Interstate-Regular.woff) format("woff"); font-weight: 400; font-style: normal } @@ -4757,6 +4763,7 @@ label{ display: flex; align-items: center; padding-left: 11px; + padding-right: 10px; padding-top: 10px; line-height: 110%; z-index: 101 @@ -6337,3 +6344,11 @@ label{ white-space:nowrap; z-index: 13; } +#marqueeSevere div{ + font-family: 'Interstate2'; + text-shadow: 2px 2px 4px #000; + font-synthesis: weight; + font-weight: 600; + font-size: 46px; + color: #DDDDDD; +} diff --git a/webroot/js/newweathermanager.js b/webroot/js/newweathermanager.js index 6ea4428..9e97ed2 100644 --- a/webroot/js/newweathermanager.js +++ b/webroot/js/newweathermanager.js @@ -477,7 +477,7 @@ function grabCitySlidesData() { weatherLocsDP.daytitle = buildHourlyHeaderTitle(ajaxedLoc["v3-wx-forecast-hourly-2day"].validTimeLocal[indexes[0]]) for (var hi = 0; hi < 4; hi++) { weatherLocsDP.hour[hi].time = buildHourlyTimeTitle(ajaxedLoc["v3-wx-forecast-hourly-2day"].validTimeLocal[indexes[hi]]) - weatherLocsDP.hour[hi].cond = ajaxedLoc["v3-wx-forecast-hourly-2day"].wxPhraseShort[indexes[hi]].replace('M ', 'Mostly ').replace('P ','Partly ').replace('PMostly ', 'PM').replace('AMostly ', 'AM') + weatherLocsDP.hour[hi].cond = ajaxedLoc["v3-wx-forecast-hourly-2day"].wxPhraseLong[indexes[hi]].replace('Scattered ', "Sct'd ").replace('Thunderstorms',"T'Storms").replace('/',', '); weatherLocsDP.hour[hi].icon = ajaxedLoc["v3-wx-forecast-hourly-2day"].iconCode[indexes[hi]] weatherLocsDP.hour[hi].temp = ajaxedLoc["v3-wx-forecast-hourly-2day"].temperature[indexes[hi]] weatherLocsDP.hour[hi].wind = ajaxedLoc["v3-wx-forecast-hourly-2day"].windDirectionCardinal[indexes[hi]] + ' ' + ajaxedLoc["v3-wx-forecast-hourly-2day"].windSpeed[indexes[hi]] @@ -502,7 +502,7 @@ function grabCitySlidesData() { for (var hi = (ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].daypartName[0] == null) ? 1 : 0, hidp = (ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].daypartName[0] == null) ? 2 : 0; hi < 5 + daycorrection; hi++, hidp = hidp + 2) { weatherLocsFD.day[hi - daycorrection].name = ajaxedLoc["v3-wx-forecast-daily-5day"].dayOfWeek[hi].substring(0,3) weatherLocsFD.day[hi - daycorrection].icon = ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].iconCode[hidp] - weatherLocsFD.day[hi - daycorrection].cond = ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].wxPhraseShort[hidp].replace('M ', 'Mostly ').replace('P ','Partly ').replace('M ', 'Mostly ').replace('P ','Partly ').replace('PMostly ', 'PM').replace('AMostly ', 'AM'); + weatherLocsFD.day[hi - daycorrection].cond = ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].wxPhraseLong[hidp].replace('Scattered ', "Sct'd ").replace('Thunderstorms',"T'Storms").replace('/',', '); weatherLocsFD.day[hi - daycorrection].high = ajaxedLoc["v3-wx-forecast-daily-5day"].temperatureMax[hi] weatherLocsFD.day[hi - daycorrection].windspeed = ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].windSpeed[hidp] weatherLocsFD.day[hi - daycorrection].low = ajaxedLoc["v3-wx-forecast-daily-5day"].temperatureMin[hi] @@ -687,7 +687,7 @@ function grabSideandLowerBarData() { weatherInfo.dayPart.lowerbar.daytitle = buildHourlyHeaderTitle(ajaxedLoc["v3-wx-forecast-hourly-2day"].validTimeLocal[indexes[0]]) for (var hi = 0; hi < 4; hi++) { weatherInfo.dayPart.lowerbar.hour[hi].time = buildHourlyTimeTitle(ajaxedLoc["v3-wx-forecast-hourly-2day"].validTimeLocal[indexes[hi]]) - weatherInfo.dayPart.lowerbar.hour[hi].cond = ajaxedLoc["v3-wx-forecast-hourly-2day"].wxPhraseShort[indexes[hi]].replace('M ', 'Mostly ').replace('P ','Partly ').replace('PMostly ', 'PM').replace('AMostly ', 'AM') + weatherInfo.dayPart.lowerbar.hour[hi].cond = ajaxedLoc["v3-wx-forecast-hourly-2day"].wxPhraseLong[indexes[hi]].replace('Scattered ', "Sct'd ").replace('Thunderstorms',"T'Storms").replace('/',', ') weatherInfo.dayPart.lowerbar.hour[hi].icon = ajaxedLoc["v3-wx-forecast-hourly-2day"].iconCode[indexes[hi]] weatherInfo.dayPart.lowerbar.hour[hi].temp = ajaxedLoc["v3-wx-forecast-hourly-2day"].temperature[indexes[hi]] weatherInfo.dayPart.lowerbar.hour[hi].wind = ajaxedLoc["v3-wx-forecast-hourly-2day"].windDirectionCardinal[indexes[hi]] + ' ' + ajaxedLoc["v3-wx-forecast-hourly-2day"].windSpeed[indexes[hi]] @@ -710,7 +710,7 @@ function grabSideandLowerBarData() { weatherInfo.fiveDay.lowerbar.day[hi - daycorrection].name = ajaxedLoc["v3-wx-forecast-daily-5day"].dayOfWeek[hi].substring(0,3) weatherInfo.fiveDay.lowerbar.day[hi - daycorrection].windspeed = ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].windSpeed[hidp] weatherInfo.fiveDay.lowerbar.day[hi - daycorrection].icon = ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].iconCode[hidp] - weatherInfo.fiveDay.lowerbar.day[hi - daycorrection].cond = ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].wxPhraseShort[hidp].replace('M ', 'Mostly ').replace('P ','Partly ').replace('M ', 'Mostly ').replace('P ','Partly ').replace('PMostly ', 'PM').replace('AMostly ', 'AM'); + weatherInfo.fiveDay.lowerbar.day[hi - daycorrection].cond = ajaxedLoc["v3-wx-forecast-daily-5day"].daypart[0].wxPhraseLong[hidp].replace('Scattered ', "Sct'd ").replace('Thunderstorms',"T'Storms").replace('/',', '); weatherInfo.fiveDay.lowerbar.day[hi - daycorrection].high = ajaxedLoc["v3-wx-forecast-daily-5day"].temperatureMax[hi] weatherInfo.fiveDay.lowerbar.day[hi - daycorrection].low = ajaxedLoc["v3-wx-forecast-daily-5day"].temperatureMin[hi] weatherInfo.fiveDay.lowerbar.day[hi - daycorrection].weekend = ((dateFns.isWeekend(ajaxedLoc["v3-wx-forecast-daily-5day"].validTimeLocal[hi])) ? ' weekend' : '') diff --git a/webroot/js/slides-loop.js b/webroot/js/slides-loop.js index 9c5421c..7e4123f 100644 --- a/webroot/js/slides-loop.js +++ b/webroot/js/slides-loop.js @@ -984,7 +984,7 @@ var mainMap ,pollen() { if (weatherInfo.healthPollen.totalcat && weatherInfo.healthforecast.noReport == false) { $('.info-slide-content.allergy .totalpollen .desc').text(weatherInfo.healthPollen.totalcat) - $('.info-slide-content.allergy .pollen .pollenbar.tree .type').html(weatherInfo.healthPollen.types[0].treetype) + $('.info-slide-content.allergy .pollen .pollenbar.tree .treetype').text(weatherInfo.healthPollen.types[0].treetype) $('.info-slide-content.allergy .pollen .thing').text("As of " + weatherInfo.healthPollen.date) $('.info-slide-content.allergy .totalpollen .cat').text(weatherInfo.healthPollen.total) $('.info-slide.health .subhead-title').text('Allergy Report');