Skip to content

Commit c21c6d8

Browse files
committed
Improve settings dialog appearance in Firefox and Safari.
1 parent ea3aeda commit c21c6d8

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

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.

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",
3-
"version": "1.0.8",
3+
"version": "1.0.9",
44
"license": "MIT",
55
"author": "Kerry Shetline <kerry@shetline.com>",
66
"scripts": {

src/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@
192192
</div>
193193
</div>
194194
<div class="dialog-buttons">
195-
<span class="version-number">1.0.8</span>
195+
<span class="version-number">1.0.9</span>
196196
<button id="settings-reload">Reload</button>
197197
<span>&bull;</span>
198198
<button id="settings-cancel">Cancel</button>
199-
<button id="settings-ok">OK</button>
199+
<button id="settings-ok">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>
200200
</div>
201201
</div>
202202
</div>

src/settings-dialog.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import * as $ from 'jquery';
2121
import { domAlert, htmlEncode, popKeydownListener, pushKeydownListener } from './util';
2222
import { Settings } from './settings';
2323
import { AppService } from './app.service';
24-
import { isIE } from 'ks-util';
24+
import { isIE, isSafari } from 'ks-util';
2525

2626
const ERROR_BACKGROUND = '#FCC';
2727
const WARNING_BACKGROUND = '#FFC';
@@ -133,12 +133,13 @@ export class SettingsDialog {
133133
});
134134

135135
if (isIE()) {
136-
const userOptions = $('.user-options');
137-
138-
userOptions.children().each(function() {
136+
$('.user-options').children().each(function() {
139137
$(this).css('margin', '0 4px 4px 0');
140138
});
141139
}
140+
else if (isSafari()) {
141+
$('.user-options').css('grid-row-gap', '0');
142+
}
142143
}
143144

144145
private doSearch(): void {

src/styles.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,12 @@ body {
226226
display: grid;
227227
-ms-grid-columns: max-content auto auto;
228228
grid-template-columns: max-content auto auto;
229-
grid-gap: 4px;
229+
grid-column-gap: 4px;
230+
grid-row-gap: 3px;
230231

231232
&>* {
232233
-ms-grid-row-align: center;
233-
align-self: baseline;
234+
align-self: center;
234235
display: block; // Needed to make IE grid layout work
235236
}
236237

0 commit comments

Comments
 (0)