diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css new file mode 100644 index 0000000..6bde9bc --- /dev/null +++ b/src/main/resources/public/css/conference.css @@ -0,0 +1,14 @@ +.member-list{ + height: 200px; + padding: 0px; +} + +.member{ + margin: 0; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: .25rem; + transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; +} \ No newline at end of file diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index 159f14a..901822f 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -3,7 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="default"> - +
@@ -28,14 +28,14 @@
- +
- -
@@ -47,33 +47,51 @@ value="Добавить дедлайн"/> -
+
-
-
Дата проведения:
-
-
+ +
-
-
+ -
+
-
-
-
Дата изменения:
+ +
+
+
+ Пользователь 1 +
+
+ очная +
+
+ статья +
-
+
+
+ Пользователь 2 +
+
+ заочная +
+
+ доклад +
+ +