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

#53 added actual.html, css fixes

Browse Source
merge-requests/33/head
Nightblade73 5 years ago
parent bff824bc06
commit 99468a0cea
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File

11
src/main/resources/public/css/conference.css
Unescape Escape View File

@ -7,13 +7,15 @@
height: 41px; height: 41px;
} }
.dashboard-elements { .year-filter {
align-items: center; width: 61px;
justify-content: left; margin-right: 5px;
} }
.conference-list-body { .conference-list-body {
height: 500px; height: 500px;
border: 1px solid #ced4da;
border-radius: .25rem;
} }
.conference-item { .conference-item {
@ -83,12 +85,13 @@
} }
.control-panel { .control-panel {
height: 50px; height: auto;
} }
.form-group textarea { .form-group textarea {
min-height: 206px; min-height: 206px;
max-height: 463px; max-height: 463px;

25
src/main/resources/templates/conferences/actual.html
Unescape Escape View File

@ -1,10 +1,29 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default" xmlns:th="">
<head> <head>
<meta charset="UTF-8"> <link rel="stylesheet" type="text/css" href="../css/conference.css"/>
<title>Title</title>
</head> </head>
<body> <body>
<div layout:fragment="content">
<section id="conference">
<div class="container">
<div class="row">
<div class="col-lg-12">
<h3 class="section-heading text-uppercase text-center">Актуальные конференции</h3>
<div th:replace="conferences/fragments/confNavigationFragment"/>
</div>
</div>
<hr/>
<div class="row">
<div class="col-lg-12">
</div>
</div>
</div>
</section>
</div>
</body> </body>
</html> </html>

12
src/main/resources/templates/conferences/conferences.html
Unescape Escape View File

@ -20,21 +20,18 @@
<div class="row dashboard"> <div class="row dashboard">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="d-flex bd-highlight dashboard-elements"> <div class="d-flex bd-highlight dashboard-elements align-items-center justify-content-left">
<div class="form-check p-1 bd-highlight"> <div class="form-check p-1 bd-highlight">
<div class="checkbox" id="select-all-js"></div> <div class="checkbox" id="select-all-js"></div>
</div> </div>
<button type="button" class="btn btn-danger">Удалить</button> <button type="button" class="btn btn-danger mr-auto">Удалить</button>
<button type="button" class="btn btn-success data-href-js mr-auto" data-href="./conference">
Добавить
</button>
<div class="form-row align-items-center justify-content-end"> <div class="form-row align-items-center justify-content-end">
<label for="filter" class="col-auto col-form-label">Фильтровать по годам:</label> <label for="filter" class="col-auto col-form-label">Фильтровать по годам:</label>
<div class="col-2" id="filter"> <div class="year-filter" id="filter">
<input type="text" class="form-control" placeholder="2000"/> <input type="text" class="form-control" placeholder="2000"/>
</div> </div>
<div class="col-2"> <div class="year-filter">
<input type="text" class="form-control" placeholder="2020"/> <input type="text" class="form-control" placeholder="2020"/>
</div> </div>
</div> </div>
@ -42,6 +39,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="conference-list-body list-group"> <div class="conference-list-body list-group">

Write Preview
Loading…
Cancel
Save