diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index b7ff6d4..ec88796 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -2,119 +2,6 @@ body { min-width: 400px; } -.dashboard { - margin-bottom: 10px; -} - -.dashboard button { - margin-left: 10px; - height: 41px; -} - -.year-filter { - width: 65px; - margin-right: 5px; -} - -.conference-list-body { - height: 500px; - border: 1px solid #ced4da; - border-radius: .25rem; -} - -.conference-item { - align-items: center; - justify-content: center; - padding: 0; -} - -.conference-item:hover { - background-color: #eee; -} - -.form-check { - display: flex; - align-items: center; - justify-content: center; - width: 31px; - height: 41px; -} - -.checkbox { - position: relative; - width: 13px; - height: 13px; - border-radius: 15%; - background: #fff; - border: 1px solid #aaa; - cursor: pointer; -} - -.selected:before { - content: '✔'; - position: absolute; - line-height: 0.8; - color: #09ad7e; - transition: all .2s; -} - -.circle { - position: relative; - width: 13px; - height: 13px; - margin: 10px 5px; - border-radius: 50%; - background: #fff; - border: 1px solid #fed136; -} - -.circle-active:before { - content: ''; - position: absolute; - width: 11px; - height: 11px; - border-radius: 50%; - background: #ff9800; -} - -.conference-info:hover { - cursor: pointer; -} - -.conference-item:hover .form-check { - background-color: #ddd; -} - -.conference-item:hover .form-check:hover { - background-color: #ccc; - cursor: pointer; -} - -.conference-item:hover .form-check:hover .circle { - background: #ffdc64; -} - -.control-panel { - height: auto; -} - -.row-bottom { - margin-top: 10px; -} - -.pagination li a { - color: #000; -} - -.pagination li a:hover { - color: #000; -} - -.pagination .active .page-link { - background-color: #ff9800; - border-color: #ff9800; -} - @@ -226,18 +113,10 @@ body { @media (max-width: 768px) { .dashboard-elements { - position: relative!important; display: block!important; - height: 100px; - } - - .dashboard-left { - position: relative; - top: 58px; } .dashboard-right { - position: relative; - top: -39px; + margin-bottom: 10px; } } diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index 9b3f322..59545b5 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -45,8 +45,9 @@
+
- - - +
-
-
-
-
-

Список конференций

-
-
-
-
- -
-
-
- -
-
-
-
- -
- -
- -
- -
-
- -
-
- +
+
+
+
+
+

Конференции

+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
Конференция 1
-
01.01.1990
-
-
-
-
-
-
-
-
-
-
-
Конференция 1
-
01.01.1990
-
+
+
+
+
Фильтр:
+ +
- -
-
- +
+ +
- \ No newline at end of file + + diff --git a/src/main/resources/templates/conferences/fragments/confDashboardFragment.html b/src/main/resources/templates/conferences/fragments/confDashboardFragment.html new file mode 100644 index 0000000..080946c --- /dev/null +++ b/src/main/resources/templates/conferences/fragments/confDashboardFragment.html @@ -0,0 +1,21 @@ + + + + + + +
+
+
+ +
+
+ title +

+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/conferences/fragments/confLineFragment.html b/src/main/resources/templates/conferences/fragments/confLineFragment.html new file mode 100644 index 0000000..f54a777 --- /dev/null +++ b/src/main/resources/templates/conferences/fragments/confLineFragment.html @@ -0,0 +1,23 @@ + + + + + + +
+ +
+ + + + \ No newline at end of file