diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index 3b867c6..e29ef9a 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -1,6 +1,13 @@ +.form-group textarea{ + min-height: 206px; + max-height: 463px; +} + + .deadline-list{ height: 200px; padding: 0px; + overflow-y: scroll; } .deadline{ @@ -14,12 +21,32 @@ .member-list{ height: 200px; padding: 0px; + overflow-y: scroll; } .member{ margin: 0; } +.paper-list{ + height: 200px; + padding: 0px; + overflow-y: scroll; +} + +.paper{ + margin: 0; +} + +.paper-name{ + flex: 1; +} + +.paper-name span{ + margin: 6px 15px; + display: inline-block; +} + .icon{ width: 38px; height: 38px; @@ -27,9 +54,21 @@ cursor: pointer; } +.icon-delete{ + background: #ff4444; +} + +.icon-paper{ + height: 26px; + width: 26px; + float: right; + margin: 5px; +} + .icon-edit-input-text{ width: 27px; height: 27px; + float: right; } .grey-border{ diff --git a/src/main/resources/public/img/conference/paper.png b/src/main/resources/public/img/conference/paper.png new file mode 100644 index 0000000..78a0dfc Binary files /dev/null and b/src/main/resources/public/img/conference/paper.png differ diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index 599c745..e8b8935 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -19,8 +19,10 @@
+
+
Редактировать - Удалить
-
+
-
+
@@ -106,13 +109,40 @@
-
-
+ +
+ +
+
+
+ + Имя статьи + + +
+ Удалить +
+
+
+
+ + +
+ +