diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java index d301d80..2d95482 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -52,8 +52,8 @@ public class VotingController { @PostConstruct public void init() { - votingPhase = false; - addingPhase = true; + votingPhase = true; + addingPhase = false; LOGGER.info("Program started with arguments: votingPhase="+ votingPhase + " addingPhase=" + addingPhase); diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java index c4bc283..b50e0f7 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java @@ -99,7 +99,7 @@ public class TableAction { Collections.sort(possibleCandidatesPerCategory, Comparator.comparing(PossibleCandidate::getVotes)); Collections.reverse(possibleCandidatesPerCategory); for (int j = 0; j < getLimit(possibleCandidatesPerCategory); j++){ - if (j >= 10 && possibleCandidatesPerCategory.get(j).getVotes() == possibleCandidatesPerCategory.get(j-1).getVotes()){ + if (j >= 10 && possibleCandidatesPerCategory.get(j).getVotes() == possibleCandidatesPerCategory.get(9).getVotes()){ Candidate candidate = new Candidate(possibleCandidatesPerCategory.get(j).getName(), possibleCandidatesPerCategory.get(j).getCategory()); candidateRepository.save(candidate); } diff --git a/src/main/resources/static/styles/voting.css b/src/main/resources/static/styles/voting.css index e0ff00c..5c99db7 100644 --- a/src/main/resources/static/styles/voting.css +++ b/src/main/resources/static/styles/voting.css @@ -42,7 +42,8 @@ button { } .submitButton { - margin-top: 5%; + margin-top: 2%; + margin-bottom: 5%; padding: .25em 0; border: 0; outline: 0; @@ -56,6 +57,23 @@ button { text-shadow: 0 -2px 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(255, 255, 255, 0.2); } +@media only screen and (max-device-width: 480px) { + .submitButton { + margin-top: 2%; + padding: .25em 0; + border: 0; + outline: 0; + background: rgb(6, 216, 136); + color: rgba(255, 255, 255, 0.85); + font-size: 2rem; + width: 500px; + letter-spacing: .0625rem; + border-radius: 12px; + box-shadow: 0 3px 5px 1px rgba(0, 0, 0, 0.25); + text-shadow: 0 -2px 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(255, 255, 255, 0.2); + } +} + html, body { width: 100%; diff --git a/src/main/resources/templates/errors/alreadyVoted.html b/src/main/resources/templates/errors/alreadyVoted.html index cea84dc..2fafb30 100644 --- a/src/main/resources/templates/errors/alreadyVoted.html +++ b/src/main/resources/templates/errors/alreadyVoted.html @@ -8,38 +8,15 @@
-