Skip to content

Commit de905eb

Browse files
committed
Fix Safari-only bug with clipped display of tinted signal level meter.
1 parent 502c595 commit de905eb

8 files changed

Lines changed: 50 additions & 26 deletions

File tree

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aw-clock",
3-
"version": "2.1.1",
3+
"version": "2.1.2",
44
"license": "MIT",
55
"author": "Kerry Shetline <kerry@shetline.com>",
66
"scripts": {
@@ -28,7 +28,7 @@
2828
"devDependencies": {
2929
"@types/copyfiles": "^2.1.1",
3030
"@types/follow-redirects": "^1.8.0",
31-
"@types/jasmine": "^3.5.8",
31+
"@types/jasmine": "^3.5.9",
3232
"@types/jasminewd2": "^2.0.8",
3333
"@types/jquery": "^3.3.33",
3434
"@types/js-cookie": "^2.2.5",

server/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aw-clock-server",
3-
"version": "2.1.1",
3+
"version": "2.1.2",
44
"license": "MIT",
55
"author": "Kerry Shetline <kerry@shetline.com>",
66
"private": true,

server/src/forecast-types.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@ export interface CommonConditions {
1616
precipType?: string;
1717
}
1818

19-
export const CurrentConditionsKeys = Array.from(CommonConditionsKeys);
20-
CurrentConditionsKeys.push('temperature', 'feelsLikeTemperature');
19+
export const CurrentConditionsKeys = [...CommonConditionsKeys, 'temperature', 'feelsLikeTemperature'];
2120

2221
export interface CurrentConditions extends CommonConditions {
2322
temperature: number;
2423
feelsLikeTemperature: number;
2524
}
2625

27-
export const DailyConditionsKeys = Array.from(CommonConditionsKeys);
28-
DailyConditionsKeys.push('temperatureHigh', 'temperatureLow', 'precipAccumulation');
26+
export const DailyConditionsKeys = [...CommonConditionsKeys, 'temperatureHigh', 'temperatureLow', 'precipAccumulation'];
2927

3028
export interface DailyConditions extends CommonConditions {
3129
temperatureHigh: number;

src/current-temp-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export class CurrentTempManager {
5858
}
5959
}
6060

61-
// Null values erase old values, undefined values preserver old values, defined values replace old values
61+
// Null values erase old values, undefined values preserve old values, defined values replace old values
6262
updateCurrentTempAndHumidity(cthUpdate: CurrentTemperatureHumidity, celsius: boolean): void {
6363
Object.keys(cthUpdate ?? {}).forEach(key => {
6464
if (cthUpdate[key] !== undefined)

src/index.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<div id="clock-container">
1313
<svg id="clock" viewBox="0 0 172 108">
1414
<!-- <rect x="0" y="0" width="172" height="108" stroke-width="1" stroke="black" fill="none"></rect> -->
15-
<filter id="meter-tint">
16-
<feColorMatrix type="matrix" values="1 0 0 0 0 0 0.5 0 0 0 0 1 1 0 0 0 0 0 1 0"></feColorMatrix>
17-
</filter>
18-
1915
<text id="timezone" x="50" y="2.5" text-anchor="middle"></text>
2016
<text id="day-of-week" x="1" y="9">---</text>
2117
<text id="month" x="1" y="99">--</text>
@@ -264,7 +260,7 @@
264260
</div>
265261
</div>
266262
<div class="dialog-buttons">
267-
<span class="version-number">2.1.1</span>
263+
<span class="version-number">2.1.2</span>
268264
<button id="settings-reload">Reload</button>
269265
<span>&bull;</span>
270266
<button id="settings-cancel">Cancel</button>

src/styles.scss

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,11 @@ input, button, select, textarea, optgroup, option { // Ignored by macOS Chrome f
554554
}
555555

556556
.signal-meter {
557-
fill: rgba(63, 255, 63, 0.30)
557+
fill: rgba(63, 255, 63, 0.25)
558+
}
559+
560+
.meter-tint .signal-meter {
561+
fill: rgba(63, 63, 255, 0.40)
558562
}
559563

560564
.signal-level-1 {
@@ -563,30 +567,60 @@ input, button, select, textarea, optgroup, option { // Ignored by macOS Chrome f
563567
}
564568
}
565569

570+
.signal-level-1.meter-tint {
571+
.signal-bar-1 {
572+
fill: #5BF;
573+
}
574+
}
575+
566576
.signal-level-2 {
567577
.signal-bar-1, .signal-bar-2 {
568578
fill: #0F0;
569579
}
570580
}
571581

582+
.signal-level-2.meter-tint {
583+
.signal-bar-1, .signal-bar-2 {
584+
fill: #5BF;
585+
}
586+
}
587+
572588
.signal-level-3 {
573589
.signal-bar-1, .signal-bar-2, .signal-bar-3 {
574590
fill: #0F0;
575591
}
576592
}
577593

594+
.signal-level-3.meter-tint {
595+
.signal-bar-1, .signal-bar-2, .signal-bar-3 {
596+
fill: #5BF;
597+
}
598+
}
599+
578600
.signal-level-4 {
579601
.signal-bar-1, .signal-bar-2, .signal-bar-3, .signal-bar-4 {
580602
fill: #0F0;
581603
}
582604
}
583605

606+
.signal-level-4.meter-tint {
607+
.signal-bar-1, .signal-bar-2, .signal-bar-3, .signal-bar-4 {
608+
fill: #5BF;
609+
}
610+
}
611+
584612
.signal-level-5 {
585613
.signal-bar-1, .signal-bar-2, .signal-bar-3, .signal-bar-4, .signal-bar-5 {
586614
fill: #0F0;
587615
}
588616
}
589617

618+
.signal-level-5.meter-tint {
619+
.signal-bar-1, .signal-bar-2, .signal-bar-3, .signal-bar-4, .signal-bar-5 {
620+
fill: #5BF;
621+
}
622+
}
623+
590624
.signal-lost .no-signal {
591625
display: block !important;
592626
}
@@ -609,10 +643,6 @@ input, button, select, textarea, optgroup, option { // Ignored by macOS Chrome f
609643
fill: #AAA;
610644
}
611645

612-
.meter-tint {
613-
filter: url(#meter-tint);
614-
}
615-
616646
.equisolstice {
617647
fill: #FA0;
618648
}

0 commit comments

Comments
 (0)