romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

#70 style fixes

Browse Source
This commit is contained in:
Nightblade73 2019-04-27 20:34:49 +04:00
parent e178cd1639
commit 0e8752e460
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/ulstu/timeline/model/EventDto.java
View File

@ -39,7 +39,7 @@ public class EventDto {
@JsonProperty("description") String description, @JsonProperty("description") String description,
@JsonProperty("paperDto") PaperDto paperDto, @JsonProperty("paperDto") PaperDto paperDto,
@JsonProperty("recipients") List<UserDto> recipients, @JsonProperty("recipients") List<UserDto> recipients,
@JsonProperty("paperDto") ConferenceDto conferenceDto) { @JsonProperty("conferenceDto") ConferenceDto conferenceDto) {
this.id = id; this.id = id;
this.title = title; this.title = title;
this.period = period; this.period = period;

18
src/main/resources/public/css/conference.css
View File

@ -7,6 +7,10 @@ body {
border-radius: .25rem; border-radius: .25rem;
} }
.conference-row .d-flex:hover .icon-delete {
visibility: visible;
}
.filter-option-inner-inner { .filter-option-inner-inner {
color: white; color: white;
} }
@ -17,10 +21,20 @@ body {
.conference-row .d-flex .text-decoration { .conference-row .d-flex .text-decoration {
text-decoration: none; text-decoration: none;
margin: 0;
} }
.conference-row .d-flex .text-decoration:nth-child(1) { .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 { .icon-delete:hover {
background-color: #ff0000; background-color: #ff0000 !important;
transition: background-color .15s ease-in-out; transition: background-color .15s ease-in-out;
} }

6
src/main/resources/templates/conferences/fragments/confLineFragment.html
View File

@ -7,17 +7,13 @@
<div th:fragment="confLine (conference)" class="row text-left conference-row h3" style="background-color: white;"> <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"> <div class="d-flex justify-content-between w-100">
<a th:href="@{'conference?id='+${conference.id}}" class="w-100 text-decoration"> <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}"/> <span class="text-muted h6 float-right m-2" th:text="${conference.datesString}"/>
</a> </a>
<input class="id-class" type="hidden" th:value="${conference.id}"/> <input class="id-class" type="hidden" th:value="${conference.id}"/>
<input type="submit" class="icon icon-delete grey-border" <input type="submit" class="icon icon-delete grey-border"
alt="Удалить" th:value="${conference.id}" alt="Удалить" th:value="${conference.id}"
data-confirm="Удалить конференцию?"/> 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>
</div> </div>