diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index 60ed029..27d9c5d 100644 --- 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; diff --git a/src/main/resources/templates/conferences/actual.html b/src/main/resources/templates/conferences/actual.html index 566549b..7e99e74 100644 --- a/src/main/resources/templates/conferences/actual.html +++ b/src/main/resources/templates/conferences/actual.html @@ -1,10 +1,29 @@ - + - - Title + +
+
+
+
+
+

Актуальные конференции

+
+
+
+
+
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/conferences/conferences.html b/src/main/resources/templates/conferences/conferences.html index 4c83f4a..ac5348f 100644 --- a/src/main/resources/templates/conferences/conferences.html +++ b/src/main/resources/templates/conferences/conferences.html @@ -20,21 +20,18 @@
-
+
- - +
-
+
-
+
@@ -42,6 +39,7 @@
+