Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"Preferences" styling #563

Merged
merged 4 commits into from
Oct 29, 2020
Merged

"Preferences" styling #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74f5452
Added "Font Awsome" package, added icons to "Preferences window", small
saviusz Oct 27, 2020
cf1bee5
Update src/preferences.html
saviusz Oct 27, 2020
c814d49
Update styles.css
saviusz Oct 28, 2020
b6bcd6f
Update styles.css
saviusz Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,8 @@ body {
display: inline-block;
width: 30px;
height: 15px;
margin-top: auto;
margin-bottom: auto;
}

/* Hide default HTML checkbox */
Expand Down Expand Up @@ -648,6 +650,17 @@ input:disabled + .slider {
left: 25px;
}

#preferences-window #hours-per-day {
text-align: right;
}

#preferences-window i {
margin-inline-start: 0em;
margin-inline-end: 0.3em;
width: 1.5ch;
text-align: center;
}

/* Waiver page styles */

#workday-waiver-window .section-title {
Expand Down
5 changes: 5 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,16 @@
"tape": "^5.0.1"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
"bootstrap": "^4.5.3",
"date-holidays": "^1.8.1",
"electron-store": "^6.0.1",
"i18next-node-fs-backend": "^2.1.3",
"i18next": "^19.8.2",
"i18next-node-fs-backend": "^2.1.3",
"is-online": "^8.5.1",
"jquery": "^3.5.1",
"jquery-i18next": "^1.2.1",
"jquery-mousewheel": "^3.1.13",
"jquery": "^3.5.1",
"node-notifier": "^8.0.0",
"popper.js": "^1.16.1"
},
Expand Down
69 changes: 40 additions & 29 deletions src/preferences.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<head>
<title data-i18n="$Preferences.title">Time to Leave - Preferences</title>
<link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="../node_modules/@fortawesome/fontawesome-free/css/all.min.css">
<link rel="stylesheet" href="../css/styles.css">

<!-- First we need to declare jQuery and $ globals with jquery -->
Expand Down Expand Up @@ -46,68 +47,78 @@
<p data-i18n="$Preferences.hoursPerDay">Hours per day</p>
<input data-i18n="[placeholder]$Preferences.hours-per-day" type="text" name="hours-per-day" id="hours-per-day" maxlength=5 pattern="^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$" value="08:00" size=5 required oninput="this.reportValidity()" onblur="this.value = this.checkValidity() ? this.value : '08:00'">
</div>

</section>

<section>
<div class="section-title" data-i18n="$Preferences.appBehavior">App Behavior</div>
<div class="section-title" data-i18n="$Preferences.notification">Notification</div>
<div class="flex-box">
<p data-i18n="$Preferences.notification">Notification</p>
<p><i class="far fa-bell"></i> <span data-i18n="$Preferences.notification">Notification</span></p>
<label class="switch"><input type="checkbox" id="notification" name="notification"><span class="slider round"></span></label>
</div>
<div class="flex-box">
<p data-i18n="$Preferences.allowRecurringNotifications">Allow recurring notifications</p>
<p><i class="fas fa-redo"></i> <span data-i18n="$Preferences.allowRecurringNotifications">Allow recurring notifications</span></p>
<label class="switch"><input type="checkbox" id="repetition" name="repetition"><span class="slider round"></span></label>
</div>
<div class="flex-box mb-2">
<p data-i18n="$Preferences.minutesBetweenNotifications">Minutes between notifications</p>
<p><i class="fas fa-stopwatch"></i><span data-i18n="$Preferences.minutesBetweenNotifications">Minutes between notifications</span></p>
<input type="number" name="notifications-interval" id="notifications-interval" min="1" max="30" value="5" required onblur="this.value = this.checkValidity() ? this.value : 5">
</div>

</section>

<section>
<div class="section-title" data-i18n="$Preferences.appBehavior">App Behavior</div>
<div class="flex-box">
<p data-i18n="$Preferences.startOnLogin">Start on Login</p>
<label id='start-at-login' class="switch"><input type="checkbox" name="start-at-login"><span class="slider round"></span></label>
<p><i class="fas fa-globe"></i><span data-i18n="$Preferences.language">Language</span></p>
<select class="selects-right" id="language" name="language">
</select>
</div>
<div class="flex-box">
<p data-i18n="$Preferences.countTodayOnTotals">Count Today in Totals</p>
<label id='count-today' class="switch"><input type="checkbox" name="count-today"><span class="slider round"></span></label>
</div>
<div class="flex-box mb-2">
<p data-i18n="$Preferences.overallBalanceStart">Overall Balance Start Date</p>
<label id='overall-balance-start-date'><input type="date" class="date-right" name="overall-balance-start-date"></label>
<p><i class="far fa-play-circle"></i><span data-i18n="$Preferences.startOnLogin">Start on Login</span></p>
<label id='start-at-login' class="switch"><input type="checkbox" name="start-at-login"><span class="slider round"></span></label>
</div>
<div class="flex-box">
<p data-i18n="$Preferences.minimizeToTray">Minimize button should minimize to tray</p>
<p></i><span data-i18n="$Preferences.minimizeToTray">Minimize button should minimize to tray</span></p>
thamara marked this conversation as resolved.
Show resolved Hide resolved
<label id='minimize-to-tray' class="switch"><input type="checkbox" name="minimize-to-tray"><span class="slider round"></span></label>
</div>
<div class="flex-box">
<p data-i18n="$Preferences.closeMinimizeToTray">Close button should minimize to tray</p>
<p><span data-i18n="$Preferences.closeMinimizeToTray">Close button should minimize to tray</span></p>
thamara marked this conversation as resolved.
Show resolved Hide resolved
<label id='close-to-tray' class="switch"><input type="checkbox" name="close-to-tray"><span class="slider round"></span></label>
</div>
</section>

<section>
<div class="section-title" data-i18n="$Preferences.view">View</div>
<div class="flex-box">
<p data-i18n="$Preferences.themes">Themes</p>
<select class="selects-right" id="theme" name="theme">
<option value="system-default" data-i18n="$Preferences.systemDefault" selected>System Default</option>
<option value="light" data-i18n="$Preferences.light">Light</option>
<option value="dark" data-i18n="$Preferences.dark">Dark</option>
<option value="cadent-star" data-i18n="$Preferences.cadentStar">Cadent Star</option>
</select>
<p><i class="fas fa-calendar-day"></i><span data-i18n="$Preferences.countTodayOnTotals">Count Today in Totals</span></p>
<label id='count-today' class="switch"><input type="checkbox" name="count-today"><span class="slider round"></span></label>
</div>
<div class="flex-box">
<p data-i18n="$Preferences.view">View</p>
<select class="selects-right" id="view" name="view">
<option value="month" data-i18n="$Preferences.month" selected>Month</option>
<option value="day" data-i18n="$Preferences.day">Day</option>
</select>
<p><i class="fas fa-sign-in-alt"></i><span data-i18n="$Preferences.overallBalanceStart">Overall Balance Start Date</span></p>
<label id='overall-balance-start-date'><input type="date" class="date-right" name="overall-balance-start-date"></label>
</div>
<div class="flex-box">
<p data-i18n="$Preferences.numberOfEntries">Number of Entries</p>
<p><i class="fas fa-align-center"></i><span data-i18n="$Preferences.numberOfEntries">Number of Entries</span></p>
<select class="selects-right" id="number-of-entries" name="number-of-entries">
<option value="fixed" data-i18n="$Preferences.fixed" selected>Fixed</option>
<option value="flexible" data-i18n="$Preferences.flexible">Flexible</option>
</select>
</div>
<div class="flex-box">
<p data-i18n="$Preferences.language">Language</p>
<select class="selects-right" id="language" name="language">
<p><i class="fas fa-eye"></i><span data-i18n="$Preferences.view">View</span></p>
<select class="selects-right" id="view" name="view">
<option value="month" data-i18n="$Preferences.month" selected>Month</option>
<option value="day" data-i18n="$Preferences.day">Day</option>
</select>
</div>
<div class="flex-box">
<p><i class="fas fa-swatchbook"></i><span data-i18n="$Preferences.themes">Themes</span></p>
<select class="selects-right" id="theme" name="theme">
<option value="system-default" data-i18n="$Preferences.systemDefault" selected>System Default</option>
<option value="light" data-i18n="$Preferences.light">Light</option>
<option value="dark" data-i18n="$Preferences.dark">Dark</option>
<option value="cadent-star" data-i18n="$Preferences.cadentStar">Cadent Star</option>
</select>
</div>
</section>
Expand Down