Skip to content

Commit 17942ff

Browse files
hai-altx-softStigmatoz
hai-altx-soft
authored and
Stigmatoz
committed
Change time picker part 1
1 parent d892e73 commit 17942ff

File tree

9 files changed

+25
-7
lines changed

9 files changed

+25
-7
lines changed

‎block.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<img src="icons/time.svg" height="50">
1616
<p class="title">Time limit</p>
1717
<div class="description">You've reached today your limit on <span id='site' class="current-site"></span></div>
18-
<div class="description margin-top-10">Your current daily limit is <span id='limit' class="current-limit"></span></div>
18+
<div class="description margin-top-10">Your current daily limit is <span id='limit' class="current-limit"></span>
19+
</div>
1920
</div>
2021
<p class="product-title">Web Activity Time Tracker</p>
2122
</body>

‎options.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44
<head>
55
<meta charset="utf-8">
66
<title>Web Activity Time Tracker</title>
7+
<link href="style/picker/standalone.min.css" rel="stylesheet" />
8+
<link href="style/picker/clockpicker.min.css" rel="stylesheet" />
79
<link href="style/settings.css" rel="stylesheet" />
810
<script src="scripts/common.js"></script>
911
<script src="scripts/storage.js"></script>
1012
<script src="scripts/settings.js"></script>
1113
<script src="scripts/restriction.js"></script>
14+
<script src="scripts/picker/jquery-3.3.1.min.js"></script>
15+
<script src="scripts/picker/clockpicker.min.js"></script>
1216
</head>
1317

1418
<body>
@@ -93,7 +97,9 @@
9397
</div>
9498
<div class="margin-top-10">
9599
<input type="text" placeholder="Enter site name..." id='addRestrictionSiteLbl' />
96-
<input type="time" id='addRestrictionTimeLbl' />
100+
<div class="inline-block clockpicker" data-placement="left" data-align="top" data-autoclose="true">
101+
<input type="text" class="clock" placeholder="Time..." readonly id="addRestrictionTimeLbl">
102+
</div>
97103
<input type="button" value="+" id='addRestrictionSiteBtn' />
98104
</div>
99105
<div class="notify warning" id='notifyForRestrictionList' hidden>

‎scripts/chart/d3.v4.min.js‎

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

‎scripts/picker/clockpicker.min.js‎

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

‎scripts/picker/jquery-3.3.1.min.js‎

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

‎scripts/settings.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ document.addEventListener('DOMContentLoaded', function () {
3333
document.getElementById('rangeToDays').addEventListener('change', function () {
3434
storage.saveSettings(SETTINGS_INTERVAL_RANGE, this.value);
3535
});
36-
});
36+
$('.clockpicker').clockpicker();
3737

38-
loadSettings();
38+
loadSettings();
39+
});
3940

4041
function setBlockEvent(btnName, blockName) {
4142
blockBtnList.forEach(element => {

‎style/picker/clockpicker.min.css‎

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

‎style/picker/standalone.min.css‎

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

‎style/settings.css‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ input[type="button"]:hover {
284284
}
285285

286286
#addRestrictionSiteLbl{
287-
width: 323px;
287+
width: 333px;
288288
height: 15px;
289289
padding: 3px;
290290
}
@@ -302,6 +302,12 @@ input[type="button"]:hover {
302302
height: 250px;
303303
}
304304

305+
.clock{
306+
width: 55px;
307+
height: 15px;
308+
padding: 3px;
309+
}
310+
305311
.inline-block{
306312
display: inline-block !important;
307313
}

0 commit comments

Comments
 (0)