diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index 06d8041..ec88796 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -1,94 +1,122 @@ -.col-lg-12 a{ - position: absolute; - font-size: smaller; +body { + min-width: 400px; } -.col-lg-12 a img{ - width: 36px; - height: 33px; -} -.form-group textarea{ + + +.form-group textarea { min-height: 206px; max-height: 463px; } - -.deadline-list{ +.deadline-list { height: 200px; padding: 0px; overflow-y: scroll; } -.deadline{ +.deadline { margin: 0; + height: 40px; } -.deadline-text{ +.deadline-text { flex: 1; } -.member-list{ +.member-list { height: 200px; padding: 0px; overflow-y: scroll; } -.member{ +.member { margin: 0; } -.paper-list{ +.paper-list { height: 200px; padding: 0px; overflow-y: scroll; } -.paper{ +.paper { margin: 0; } -.paper-name{ +.paper-name { flex: 1; } -.paper-name span{ +.paper-name span { margin: 6px 15px; display: inline-block; } -.icon{ +.icon { width: 38px; height: 38px; padding: 2px; cursor: pointer; } -.icon-delete{ +.icon-delete { background-color: #f44; } -.icon-paper{ - height: 26px; - width: 26px; - float: right; - margin: 5px; +.icon-delete:hover { + background-color: #ff2929; + transition: background-color .15s ease-in-out; } -.grey-border{ +.icon-paper { + height: 26px; + width: 26px; + float: right; + margin: 5px; +} + +.grey-border { color: #495057; background-clip: padding-box; border: 1px solid #ced4da; border-radius: .25rem; - transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; -} - -#add-paper{ - margin-left: 10px; + transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; } -#cancel-button{ +#cancel-button { position: relative; font-size: 1rem; } +.paper-control button { + margin: 0 0 10px 10px; + float: right; +} + +@media (max-width: 1199px) { + .paper-control { + display: block!important; + } +} + +@media (max-width: 991px) { + .dates-panel { + display: block!important; + } + + .date { + margin-bottom: 10px; + } +} + +@media (max-width: 768px) { + .dashboard-elements { + display: block!important; + } + + .dashboard-right { + margin-bottom: 10px; + } +} diff --git a/src/main/resources/public/js/conference.js b/src/main/resources/public/js/conference.js new file mode 100644 index 0000000..304daae --- /dev/null +++ b/src/main/resources/public/js/conference.js @@ -0,0 +1,27 @@ +$(document).ready(function () { + + $('.data-href-js').click( function() { + window.location = $(this).attr('data-href'); + }); + + $('.circle').parent().click( function() { + $(this).children('.circle').toggleClass('circle-active'); + }); + + $('.checkbox-js').parent().click( function() { + $(this).children('.checkbox').toggleClass('selected'); + }); + + $('#select-all-js').click( function() { + $(this).toggleClass('selected'); + + var childNodes = $('.conference-item .form-check .checkbox') + .each(function(i, elem) { + if ($(this).hasClass('selected') && !$('#select-all-js').hasClass('selected')) { + $(this).toggleClass('selected'); + } else if (!$(this).hasClass('selected') && $('#select-all-js').hasClass('selected')){ + $(this).toggleClass('selected'); + } + }); + }); +}); diff --git a/src/main/resources/templates/conferences/actual.html b/src/main/resources/templates/conferences/actual.html new file mode 100644 index 0000000..7e99e74 --- /dev/null +++ b/src/main/resources/templates/conferences/actual.html @@ -0,0 +1,29 @@ + + + + + + +
+
+
+
+
+

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

+
+
+
+
+
+
+ + +
+
+
+
+
+ + \ 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 078e697..59545b5 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -1,7 +1,7 @@ + layout:decorator="default" xmlns:th=""> @@ -11,19 +11,16 @@
- - - Назад к списку конференций -

Редактирование конференции

+
-
-
+ +
@@ -47,14 +44,16 @@
-
-
- + +
+ - - + Удалить
+
@@ -69,39 +68,45 @@
-
- - - - +
+
+ +
+ +
+ +
-
-
-
+
+
+
Пользователь 1
-
+
очная
-
+
статья
-
-
- Пользователь 2 + +
+
+ Пользователь 1
-
- заочная +
+ очная
-
+
доклад
+
@@ -114,20 +119,20 @@
-
-
-
+
-
+