Skip to content

Commit 1718468

Browse files
committed
fix: revert unwanted UI and package changes
Restore the intended timer, settings, and package metadata behavior after unwanted follow-up edits.
1 parent 447f3d7 commit 1718468

8 files changed

Lines changed: 62 additions & 34 deletions

File tree

.yarnrc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
approvedGitRepositories:
2+
- "**"
3+
14
compressionLevel: mixed
25

36
enableGlobalCache: false
47

8+
enableScripts: true
9+
510
nodeLinker: node-modules

custom-dialog.html

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,28 @@
1717
<body>
1818
<script src="supporter.js"></script>
1919
<style>
20+
html, body {
21+
width: 100%;
22+
margin: 0;
23+
}
24+
2025
#main {
26+
width: 100%;
27+
box-sizing: border-box;
2128
padding: 10px 12px;
2229
}
2330

2431
#timer {
32+
flex: 1 1 auto;
2533
width: 100% !important;
2634
max-width: 100%;
35+
min-width: 0;
36+
}
37+
38+
#dialog-msg,
39+
#dialog-detail {
40+
width: 100%;
41+
margin-bottom: 12px;
2742
}
2843

2944
#dialog-buttons {

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<link rel="stylesheet" type="text/css" href="style.css" />
2020
</head>
2121

22-
<body class="index-page">
22+
<body>
2323

2424
<!-- loader -->
2525
<div id="loader-wrapper">

preferences-renderer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,9 +738,9 @@ function domString(type) {
738738
onkeydown="if(event.keyCode === 13) lock($('#passcode-locker').val(), $('#passcode-locker-again').val());"
739739
type="password" />
740740
<br /><br/>
741-
<div class="text-muted small">
741+
<small class="text-grey settings-title">
742742
${ store.get('islocked') ? i18n.__('locker-settings-input-tip-lock-mode-on') : i18n.__('locker-settings-input-tip-lock-mode-off') }
743-
</div></div></div>
743+
</small></div></div>
744744
<br/>`
745745
;
746746
break;

renderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let titleAlternative = {
2424
y: 20,
2525
tipElements: "a, i, span, img, div, input",
2626
noTitle: false,
27-
bottomTooltipSelectors: [],
27+
bottomTooltipSelectors: ['#statistics-back', '#back-index', '#statistics-back i'],
2828
bottomTooltipMargin: 80,
2929
isBottomTooltipElement: function(element) {
3030
let $element = $(element);

style.css

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,24 @@ li input:nth-last-child(4)::after {
260260

261261
.positive-reset-label {
262262
font-size: 0.72rem;
263+
margin: 0 3px 0 3px;
264+
transform: translateY(-2px);
265+
}
266+
267+
.positive-reset-button {
268+
display: inline;
269+
}
270+
271+
.positive-reset-button .reset-icon {
272+
width: 0.9em;
273+
font-size: 1.04rem;
274+
font-weight: 700;
275+
line-height: 1;
276+
display: inline-block;
277+
margin-left: 2px;
278+
text-align: center;
279+
transform: translateY(-3px);
280+
vertical-align: baseline;
263281
}
264282

265283
.controller-msg-big {
@@ -551,17 +569,6 @@ li input:nth-last-child(4)::after {
551569
line-height: 150%;
552570
}
553571

554-
.timer-back-home {
555-
position: absolute;
556-
top: 6px;
557-
left: 10px;
558-
z-index: 9999;
559-
font-size: 20px;
560-
text-align: left;
561-
-webkit-app-region: no-drag;
562-
-webkit-user-select: none;
563-
}
564-
565572
#stopper i::before {
566573
font-size: 2rem;
567574
}
@@ -625,14 +632,6 @@ li input:nth-last-child(4)::after {
625632
margin-bottom: 0;
626633
}
627634

628-
#settings-container .settings-title {
629-
display: block;
630-
font-size: 1rem;
631-
font-weight: 600;
632-
line-height: 1.35;
633-
margin-bottom: 2px;
634-
}
635-
636635
#settings-container a {
637636
border: 0;
638637
}
@@ -701,6 +700,11 @@ li input:nth-last-child(4)::after {
701700
margin-top: 8px;
702701
}
703702

703+
#settings-container .webdav-sync-toggle-row > .text-left > label {
704+
font-size: inherit;
705+
color: inherit;
706+
}
707+
704708
#settings-container .dropdown-reserved-button {
705709
font-size: inherit !important;
706710
}
@@ -772,7 +776,7 @@ li input:nth-last-child(4)::after {
772776
}
773777

774778
#time-bar {
775-
left: 40px;
779+
left: 10px;
776780
padding: 2px;
777781
top: 10px;
778782
}

timer.html

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
$('#exit').attr('title', i18n.__('exit'));
5353
</script>
5454
</div>
55-
<a href="javascript:backcheck()" class="work timer-back-home" id="back-index"><i class="iconfont icon-angle-left"
56-
></i></a>
57-
<div class="text-center lead work timer-back-home" id="backer">
58-
<a href="javascript:backcheck()" class="work" id="backindex2"><i class="iconfont icon-angle-left"
59-
></i></a>
60-
</div>
6155
<div id="timer" class="justify-content-center align-content-center text-center">
6256
&nbsp;&nbsp;
6357
<input type="text" id="title" class="text-center h4" maxlength="13"
@@ -187,7 +181,12 @@
187181
class="iconfont icon-pause"></i></a></div>
188182
<br />
189183
<div class="text-center text-muted" id="more-options">
190-
<span id="skipper-space" class="should-lock"></span>
184+
<a href="javascript:backcheck()" class="text-muted" id="back-index"><i class="iconfont icon-previous"
185+
></i><span
186+
class="focuser extreme-small controller-msg">
187+
<script>document.write(i18n.__('back'));</script>
188+
</span></a>
189+
<span id="skipper-space" class="should-lock">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
191190
<a href="javascript:skipper()" class="text-muted" id="skipper-container">
192191
<span
193192
class="focuser extreme-small controller-msg" id="skipper-label">
@@ -199,6 +198,10 @@
199198
<input name="passcode-locker" id="passcode-rechecker" type="password" maxlength="11"
200199
onkeydown="if(event.keyCode === 13) recheck($('#passcode-rechecker').val());" />
201200
<br />
201+
<div class="text-center lead" id="backer">
202+
<a href="javascript:backcheck()" class="text-muted" id="backindex2"><i class="iconfont icon-previous"
203+
></i></a>
204+
</div>
202205
<div class="text-center text-muted" id="only-one">
203206
<h3>
204207
<script>document.write(i18n.__('only-one-min-left'));</script>
@@ -654,6 +657,7 @@ <h3>
654657
$("#bottom-bar").css("display", "none");
655658
$("#skipper-label").text(i18n.__('positive-reset'));
656659
$("#skipper-label").addClass("positive-reset-label");
660+
$("#skipper-container").addClass("positive-reset-button");
657661
$("#skipper-container").attr('title', i18n.__('positive-reset-tip'));
658662
$("#skipper").replaceWith('<span class="reset-icon" id="skipper" aria-hidden="true">&#8634;</span>');
659663

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual changes might be lost - proceed with caution!
33

44
__metadata:
5-
version: 8
5+
version: 9
66
cacheKey: 10
77

88
"7zip-bin@npm:~5.2.0":
@@ -2429,7 +2429,7 @@ __metadata:
24292429
languageName: node
24302430
linkType: hard
24312431

2432-
"keytar@npm:^7.9.0":
2432+
"keytar@npm:7.9.0":
24332433
version: 7.9.0
24342434
resolution: "keytar@npm:7.9.0"
24352435
dependencies:
@@ -4114,7 +4114,7 @@ __metadata:
41144114
electron-store: "npm:8.2.0"
41154115
i18n: "npm:0.15.3"
41164116
jquery: "npm:3.7.1"
4117-
keytar: "npm:^7.9.0"
4117+
keytar: "npm:7.9.0"
41184118
node-fetch: "npm:2.7.0"
41194119
node-notifier: "npm:10.0.1"
41204120
node-shi: "npm:0.4.2"

0 commit comments

Comments
 (0)