#53 added actual.html, css fixes

5 years ago · 99468a0cea
parent bff824bc06
commit 99468a0cea
3 changed files with 34 additions and 14 deletions
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@ -7,13 +7,15 @@
    height: 41px;
 }

-.dashboard-elements {
-    align-items: center;
-    justify-content: left;
+.year-filter {
+    width: 61px;
+    margin-right: 5px;
 }

 .conference-list-body {
    height: 500px;
+    border: 1px solid #ced4da;
+    border-radius: .25rem;
 }

 .conference-item {
@ -83,12 +85,13 @@
 }

 .control-panel {
-    height: 50px;
+    height: auto;
 }




+
 .form-group textarea {
    min-height: 206px;
    max-height: 463px;
--- a/src/main/resources/templates/conferences/actual.html
+++ b/src/main/resources/templates/conferences/actual.html
@ -1,10 +1,29 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorator="default" xmlns:th="">
 <head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+    <link rel="stylesheet" type="text/css" href="../css/conference.css"/>
 </head>
 <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>
 </html>
--- a/src/main/resources/templates/conferences/conferences.html
+++ b/src/main/resources/templates/conferences/conferences.html
@ -20,21 +20,18 @@

            <div class="row dashboard">
                <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="checkbox" id="select-all-js"></div>
                        </div>
-                        <button type="button" class="btn btn-danger">Удалить</button>
-                        <button type="button" class="btn btn-success data-href-js mr-auto" data-href="./conference">
-                            Добавить
-                        </button>
+                        <button type="button" class="btn btn-danger mr-auto">Удалить</button>

                        <div class="form-row align-items-center justify-content-end">
                            <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"/>
                            </div>
-                            <div class="col-2">
+                            <div class="year-filter">
                                <input type="text" class="form-control" placeholder="2020"/>
                            </div>
                        </div>
@ -42,6 +39,7 @@
                    </div>
                </div>
            </div>
+
            <div class="row">
                <div class="col-lg-12">
                    <div class="conference-list-body list-group">