diff --git a/src/main/resources/static/css/global.css b/src/main/resources/static/css/global.css index 1520ace75c8da23a22662e977e5b6fd0ceca5805..78edad970f4d2e50d5079a0bb5f43bde8c07dea7 100644 --- a/src/main/resources/static/css/global.css +++ b/src/main/resources/static/css/global.css @@ -664,4 +664,4 @@ div.row-xs:nth-of-type(odd) { */ .btn-buttonface { background-color: buttonface; -} +} \ No newline at end of file diff --git a/src/main/resources/templates/request/view.html b/src/main/resources/templates/request/view.html index 53989174e4f09b9a483904af87220f7476d24ad8..b65cd2b45753c3599d8037a72fa1172f69802ac7 100644 --- a/src/main/resources/templates/request/view.html +++ b/src/main/resources/templates/request/view.html @@ -54,28 +54,46 @@ <div class="row"> <div class="col-sm-4"> - + <style> + .btn-group.feedback>.btn.focus { + transition: .5s; + outline: none !important; + box-shadow: none; + } + + .btn-group.feedback>.btn.active:nth-child(1) { background: #C23A2C !important; border: 1px solid #AD3427 !important; } + .btn-group.feedback>.btn.active:nth-child(2) { background: #F78921 !important; border: 1px solid #F67C09 !important; } + .btn-group.feedback>.btn.active:nth-child(3) { background: #EAD234 !important; border: 1px solid #E8CD1D !important; } + .btn-group.feedback>.btn.active:nth-child(4) { background: #76D142 !important; border: 1px solid #68C931 !important; } + .btn-group.feedback>.btn.active:nth-child(5) { background: #489B52 !important; border: 1px solid #408949 !important; } + + .btn-group.feedback>.btn:hover:nth-child(1) { background: #C23A2C !important; border: 1px solid #AD3427 !important; } + .btn-group.feedback>.btn:hover:nth-child(2) { background: #F78921 !important; border: 1px solid #F67C09 !important; } + .btn-group.feedback>.btn:hover:nth-child(3) { background: #EAD234 !important; border: 1px solid #E8CD1D !important; } + .btn-group.feedback>.btn:hover:nth-child(4) { background: #76D142 !important; border: 1px solid #68C931 !important; } + .btn-group.feedback>.btn:hover:nth-child(5) { background: #489B52 !important; border: 1px solid #408949 !important; } + </style> <div th:if="${request.getRequestEntity().getId().equals(#authenticated.getId()) and request.isHandled() and (!request.hasFeedback() or !request.hasFeedbackRating())}"> <div class="page-header" > <h4>Feedback</h4> </div> <form action="#" th:action="@{/request/{id}/feedback(id=${request.id})}" method="post" class="form-horizontal"> <div class= "form-group" th:if="${!request.hasFeedbackRating()}"> - <div class="btn-group btn-group-toggle" data-toggle="buttons"> - <label class="btn btn-secondary"> - <input type="radio" name="rating" value="1" id="rating0" autocomplete="off"><i class="far fa-sad-tear"></i> + <div class="btn-group btn-group-toggle btn-block feedback" data-toggle="buttons"> + <label class="btn btn-secondary border-white" style="background-color:#D6584B"> + <input type="radio" name="rating" value="1" id="rating0" autocomplete="off"><i class="fas fa-angry" style="filter: drop-shadow(0px 0px 1px #444); font-size: 18px"></i> </label> - <label class="btn btn-secondary"> - <input type="radio" name="rating" value="2" id="rating1" autocomplete="off"><i class="far fa-frown"></i> + <label class="btn btn-secondary border-white" style="background-color:#F9A352"> + <input type="radio" name="rating" value="2" id="rating1" autocomplete="off"><i class="fas fa-frown" style="filter: drop-shadow(0px 0px 1px #444); font-size: 18px"></i> </label> - <label class="btn btn-secondary"> - <input type="radio" name="rating" value="3" id="rating2" autocomplete="off"><i class="far fa-meh"></i> + <label class="btn btn-secondary border-white" style="background-color:#EFDC62"> + <input type="radio" name="rating" value="3" id="rating2" autocomplete="off"><i class="fas fa-meh" style="filter: drop-shadow(0px 0px 1px #444); font-size: 18px"></i> </label> - <label class="btn btn-secondary"> - <input type="radio" name="rating" value="4" id="rating3" autocomplete="off"><i class="far fa-smile"></i> + <label class="btn btn-secondary border-white" style="background-color:#94DB6B"> + <input type="radio" name="rating" value="4" id="rating3" autocomplete="off"><i class="fas fa-smile" style="filter: drop-shadow(0px 0px 1px #444); font-size: 18px"></i> </label> - <label class="btn btn-secondary"> - <input type="radio" name="rating" value="5" id="rating4" autocomplete="off"><i class="far fa-laugh-beam"></i> + <label class="btn btn-secondary border-white" style="background-color:#61B56B"> + <input type="radio" name="rating" value="5" id="rating4" autocomplete="off"><i class="fas fa-laugh-beam" style="filter: drop-shadow(0px 0px 1px #444); font-size: 18px"></i> </label> </div> </div> diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 127c448f3d897b754c0c5e6a31c15159646c4f0d..dc4c0925c2ecc16cf920447b0976094bdbb86663 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -50,3 +50,4 @@ queue: gcmApiKey: 12345 pushPublicKey: 12345 pushPrivateKey: 12345 + websocketURL: http://localhost:8081