From db97892af2ac74e977e784c04c041156bef31dab Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Thu, 13 Jun 2019 14:48:02 +0400 Subject: [PATCH] fix grant indicators --- src/main/resources/public/css/agency.css | 4 ++++ src/main/resources/public/js/grants.js | 2 +- .../templates/grants/fragments/grantLineFragment.html | 2 +- src/main/resources/templates/grants/grant.html | 10 +++++----- .../papers/fragments/paperStatusFragment.html | 4 ++-- src/main/resources/templates/users/changePassword.html | 6 +----- src/main/resources/templates/users/inviteModal.html | 7 +------ 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/main/resources/public/css/agency.css b/src/main/resources/public/css/agency.css index fb3ec24..82a36d2 100644 --- a/src/main/resources/public/css/agency.css +++ b/src/main/resources/public/css/agency.css @@ -782,6 +782,10 @@ ul.social-buttons li a:active, ul.social-buttons li a:focus, ul.social-buttons l margin: 5px; } +.small-icon { + width: 16px; +} + /* --------------------------------------------------- FEEDBACK STYLE ----------------------------------------------------- */ diff --git a/src/main/resources/public/js/grants.js b/src/main/resources/public/js/grants.js index c33b4df..40c3e4f 100644 --- a/src/main/resources/public/js/grants.js +++ b/src/main/resources/public/js/grants.js @@ -3,7 +3,7 @@ $(document).ready(function () { $(".grant-row").mouseenter(function (event) { var grantRow = $(event.target).closest(".grant-row"); $(grantRow).css("background-color", "#f8f9fa"); - $(grantRow).find(".remove-paper").removeClass("d-none"); + $(grantRow).find(".remove-grant").removeClass("d-none"); }); $(".grant-row").mouseleave(function (event) { diff --git a/src/main/resources/templates/grants/fragments/grantLineFragment.html b/src/main/resources/templates/grants/fragments/grantLineFragment.html index 821cf89..86ae1cf 100644 --- a/src/main/resources/templates/grants/fragments/grantLineFragment.html +++ b/src/main/resources/templates/grants/fragments/grantLineFragment.html @@ -19,7 +19,7 @@ title=${paper.title}, small=true)"/> - diff --git a/src/main/resources/templates/grants/grant.html b/src/main/resources/templates/grants/grant.html index ede1486..638cbd3 100644 --- a/src/main/resources/templates/grants/grant.html +++ b/src/main/resources/templates/grants/grant.html @@ -1,10 +1,8 @@ - - - + layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html"> +
@@ -214,7 +212,8 @@ type="submit"> Сохранить -
@@ -242,6 +241,7 @@ }); $('.selectpicker').selectpicker(); }); + /*]]>*/ function addNewFile(fileDto) { var fileNumber = $("#files-list div.row").length; diff --git a/src/main/resources/templates/papers/fragments/paperStatusFragment.html b/src/main/resources/templates/papers/fragments/paperStatusFragment.html index 7d9e479..9ada9b7 100644 --- a/src/main/resources/templates/papers/fragments/paperStatusFragment.html +++ b/src/main/resources/templates/papers/fragments/paperStatusFragment.html @@ -4,8 +4,8 @@ - - + +
diff --git a/src/main/resources/templates/users/changePassword.html b/src/main/resources/templates/users/changePassword.html index bc96b5c..37d9e7e 100644 --- a/src/main/resources/templates/users/changePassword.html +++ b/src/main/resources/templates/users/changePassword.html @@ -1,9 +1,5 @@ - - - - - +
diff --git a/src/main/resources/templates/users/inviteModal.html b/src/main/resources/templates/users/inviteModal.html index c91b397..3b02eef 100644 --- a/src/main/resources/templates/users/inviteModal.html +++ b/src/main/resources/templates/users/inviteModal.html @@ -1,10 +1,5 @@ - - - - - - +