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

style: clean up the pom file #1849

Merged
merged 5 commits into from
Aug 24, 2024
Merged

style: clean up the pom file #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1464b63
style: clean up the pom file
jo-elimu Aug 24, 2024
505eb84
style: clean up the pom file
jo-elimu Aug 24, 2024
3bf8354
refactor: adjust css for buttons
jo-elimu Aug 24, 2024
f329656
refactor: adjust css for buttons
jo-elimu Aug 24, 2024
0698dc9
refactor: time --> timestamp
jo-elimu Aug 24, 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
541 changes: 263 additions & 278 deletions pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/admin/application/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/admin/application/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/jsp/analytics/storybook-learning-event/list.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<table class="bordered highlight">
<thead>
<th>time</th>
<th>timestamp</th>
<th>android_id</th>
<th>package_name</th>
<th>storybook_id</th>
Expand All @@ -64,7 +64,7 @@
<c:forEach var="storyBookLearningEvent" items="${storyBookLearningEvents}">
<tr class="storyBookLearningEvent">
<td>
<fmt:formatDate value="${storyBookLearningEvent.time.time}" pattern="yyyy-MM-dd" />
<fmt:formatDate value="${storyBookLearningEvent.timestamp.time}" pattern="yyyy-MM-dd" />
</td>
<td>
${storyBookLearningEvent.androidId}
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/contributor/add-email.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="save" /> <i class="material-icons right">send</i>
</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/contributor/edit-motivation.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="save" /> <i class="material-icons right">send</i>
</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/contributor/edit-name.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="save" /> <i class="material-icons right">send</i>
</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/emoji/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/emoji/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
<a href="<spring:url value='/content/emoji/delete/${emoji.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/letter-sound/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down Expand Up @@ -192,7 +192,7 @@
<label for="comment"><fmt:message key="comment" /></label>
<textarea id="comment" name="comment" class="materialize-textarea"></textarea>

<button class="btn waves-effect waves-light" type="submit">
<button class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="submit" /> <i class="material-icons right">send</i>
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/letter/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/letter/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
<a href="<spring:url value='/content/letter/delete/${letter.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/multimedia/audio/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/multimedia/image/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
<sec:authorize access="hasRole('ROLE_EDITOR')">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/multimedia/video/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/multimedia/video/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
<a href="<spring:url value='/content/multimedia/video/delete/${video.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/number/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/number/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
<a href="<spring:url value='/content/number/delete/${number.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/sound/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/sound/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/storybook/chapter/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/storybook/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
<sec:authorize access="hasRole('ROLE_EDITOR')">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/word/create.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="add" /> <i class="material-icons right">send</i>
</button>
</form:form>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsp/content/word/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
</div>
</div>

<button id="submitButton" class="btn waves-effect waves-light" type="submit">
<button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
<fmt:message key="edit" /> <i class="material-icons right">send</i>
</button>
<sec:authorize access="hasRole('ROLE_EDITOR')">
Expand Down
4 changes: 3 additions & 1 deletion src/main/webapp/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ footer.page-footer .footer-copyright {
.card .card-action:last-child {
border-radius: 0 0 8px 8px;
}
.btn,
.btn {
border-radius: 4px;
}
.btn-large {
border-radius: 8px;
}
Expand Down