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

Small darkmode fixes #126

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Small darkmode fixes #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01091e3
A couple of small dark-mode fixes
ottenhoff Dec 13, 2024
93ce619
revert alert
ottenhoff Dec 13, 2024
e6021c5
Update BasePage.html
ottenhoff Dec 13, 2024
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
2 changes: 1 addition & 1 deletion tool/src/java/org/sakaiproject/attendance/tool/pages/BasePage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@

</div>
</body>
</html>
</html>
87 changes: 62 additions & 25 deletions tool/src/java/org/sakaiproject/attendance/tool/pages/EventInputPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,70 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
<form wicket:id="event">
<div class="page-header">
<h1 wicket:id="addItemTitle" class="overHeaderSpan" />
</div>
<div wicket:id="addEditItemFeedback"></div>
<div class="addItemLine">
<label wicket:for="name">
<wicket:message key="attendance.add.label.name" />
</label>
<label class="addEditReq">*</label>
<div>
<input type="text" wicket:id="name" id="name" maxlength="200"/>
<div class="container">
<form wicket:id="event" class="needs-validation" novalidate>
<div class="row mb-4">
<div class="col">
<h1 wicket:id="addItemTitle" class="display-6" />
</div>
</div>
</div>
<div class="addItemLine">
<label wicket:for="startDateTime">
<wicket:message key="attendance.add.label.startDateTime" />
</label>
<input wicket:id="startDateTime" id="startDateTime" type="datetime-local" />
</div>

<div class="buttonSection" id="buttonSection">
<button type="submit" class="saveNewItem btn-primary" wicket:id="submit" value="Save"><wicket:container wicket:id="submitLabel" /></button>
<button type="submit" class="button" wicket:id="submitAndAddAnother" value="SaveAndAddAnother"><wicket:container wicket:id="submitMoreLabel"/></button>
<button type="button" class="button" wicket:id="cancel"><wicket:message key="button.cancel" /></button>
</div>
</form>
<div wicket:id="addEditItemFeedback"></div>

<div class="row mb-3">
<div class="col-md-6">
<div class="form-floating">
<input type="text"
class="form-control"
wicket:id="name"
id="name"
maxlength="99"
placeholder="Enter name"
required />
<label wicket:for="name" class="form-label">
<wicket:message key="attendance.add.label.name" />
<span class="text-danger">*</span>
</label>
</div>
</div>
</div>

<div class="row mb-4">
<div class="col-md-6">
<div class="form-floating">
<input type="datetime-local"
class="form-control"
wicket:id="startDateTime"
id="startDateTime"
placeholder="Select date and time" />
<label wicket:for="startDateTime" class="form-label">
<wicket:message key="attendance.add.label.startDateTime" />
</label>
</div>
</div>
</div>

<div class="row">
<div class="col d-flex gap-2">
<button type="submit"
class="btn btn-primary"
wicket:id="submit">
<wicket:container wicket:id="submitLabel" />
</button>
<button type="submit"
class="btn btn-secondary"
wicket:id="submitAndAddAnother">
<wicket:container wicket:id="submitMoreLabel"/>
</button>
<button type="button"
class="btn btn-outline-secondary"
wicket:id="cancel">
<wicket:message key="button.cancel" />
</button>
</div>
</div>
</form>
</div>
</wicket:extend>
</body>
</html>
2 changes: 1 addition & 1 deletion tool/src/java/org/sakaiproject/attendance/tool/pages/Overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h1 class="overviewHeader">

<form wicket:id="take-attendance-now-form" class="takeAttendanceNowForm">
<img id="loadingGif" class="loadingGif" src="images/loading.gif" alt="Loading" style="display: none"/>
<input id="takeAttendanceNow" type="submit" wicket:id="take-attendance-now" wicket:message="value:attendance.now.button" class="active"/>
<input id="takeAttendanceNow" type="submit" wicket:id="take-attendance-now" wicket:message="value:attendance.now.button" class="btn btn-primary"/>
</form>
<div class="table-responsive">
<table id="overviewTable" class="table table-striped table-bordered overviewTable">
Expand Down
12 changes: 0 additions & 12 deletions tool/src/webapp/css/attendance.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,18 +909,6 @@ div.wicket-modal div.w_content_3 div.messageSuccess, div.wicket-modal div.w_cont
padding: 7px 30px 7px 30px;
}

form.takeAttendanceNowForm input {
background:#17214A;
color: white;
margin-bottom: 1em;
}

form.takeAttendanceNowForm input:hover {
background: #111837;
border-color: #124466;
color: white;
}

.cancel {
background: #e54028;
-webkit-border-radius: 3px;
Expand Down