From 0e8752e4607dbf4b2561668b8e657be57df37495 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Sat, 27 Apr 2019 20:34:49 +0400
Subject: [PATCH] #70 style fixes

---
 .../java/ru/ulstu/timeline/model/EventDto.java |  2 +-
 src/main/resources/public/css/conference.css   | 18 ++++++++++++++++--
 .../fragments/confLineFragment.html            |  6 +-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ru/ulstu/timeline/model/EventDto.java b/src/main/java/ru/ulstu/timeline/model/EventDto.java
index e92d2cb..ccce25a 100644
--- a/src/main/java/ru/ulstu/timeline/model/EventDto.java
+++ b/src/main/java/ru/ulstu/timeline/model/EventDto.java
@@ -39,7 +39,7 @@ public class EventDto {
                     @JsonProperty("description") String description,
                     @JsonProperty("paperDto") PaperDto paperDto,
                     @JsonProperty("recipients") List<UserDto> recipients,
-                    @JsonProperty("paperDto") ConferenceDto conferenceDto) {
+                    @JsonProperty("conferenceDto") ConferenceDto conferenceDto) {
         this.id = id;
         this.title = title;
         this.period = period;
diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css
index 6018b9c..73a96ae 100644
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@@ -7,6 +7,10 @@ body {
     border-radius: .25rem;
 }
 
+.conference-row .d-flex:hover .icon-delete {
+    visibility: visible;
+}
+
 .filter-option-inner-inner {
     color: white;
 }
@@ -17,10 +21,20 @@ body {
 
 .conference-row .d-flex .text-decoration {
     text-decoration: none;
+    margin: 0;
 }
 
 .conference-row .d-flex .text-decoration:nth-child(1) {
-    margin-left: 10px;
+    margin-left: 5px;
+}
+
+.conference-row .d-flex .icon-delete {
+    width: 29px;
+    height: 29px;
+    margin: auto;
+    border: none;
+    visibility: hidden;
+    background-color: transparent;
 }
 
 
@@ -159,7 +173,7 @@ body {
 }
 
 .icon-delete:hover {
-    background-color: #ff0000;
+    background-color: #ff0000 !important;
     transition: background-color .15s ease-in-out;
 }
 
diff --git a/src/main/resources/templates/conferences/fragments/confLineFragment.html b/src/main/resources/templates/conferences/fragments/confLineFragment.html
index ecd166d..21b4191 100644
--- a/src/main/resources/templates/conferences/fragments/confLineFragment.html
+++ b/src/main/resources/templates/conferences/fragments/confLineFragment.html
@@ -7,17 +7,13 @@
 <div th:fragment="confLine (conference)" class="row text-left conference-row h3" style="background-color: white;">
     <div class="d-flex justify-content-between w-100">
         <a th:href="@{'conference?id='+${conference.id}}" class="w-100 text-decoration">
-            <span class="h5" th:text="${conference.title}"/>
+            <span class="h6 float-left m-2" th:text="${conference.title}"/>
             <span class="text-muted h6 float-right m-2" th:text="${conference.datesString}"/>
         </a>
         <input class="id-class" type="hidden" th:value="${conference.id}"/>
         <input type="submit" class="icon icon-delete grey-border"
                alt="Удалить" th:value="${conference.id}"
                data-confirm="Удалить конференцию?"/>
-        <!--<a class="remove-paper pull-right m-auto" th:href="@{'/conferences/delete/'+${conference.id}}"-->
-        <!--data-confirm="Удалить конференцию?">-->
-        <!--<i class="fa fa-trash" aria-hidden="true"></i>-->
-        <!--</a>-->
     </div>
 </div>