diff --git a/src/main/resources/public/css/agency.css b/src/main/resources/public/css/agency.css index a846fa8..40ecae0 100644 --- a/src/main/resources/public/css/agency.css +++ b/src/main/resources/public/css/agency.css @@ -677,7 +677,7 @@ section#contact .section-heading { color: #fff; } -section#contact .form-group { +.form-group { margin-bottom: 25px; } diff --git a/src/main/resources/public/css/base.css b/src/main/resources/public/css/base.css index 59da321..e69de29 100644 --- a/src/main/resources/public/css/base.css +++ b/src/main/resources/public/css/base.css @@ -1,3 +0,0 @@ -.loader { - padding-left: 50% -} \ No newline at end of file diff --git a/src/main/resources/public/css/odin.css b/src/main/resources/public/css/odin.css deleted file mode 100644 index 0c2b7c4..0000000 --- a/src/main/resources/public/css/odin.css +++ /dev/null @@ -1,225 +0,0 @@ -.odin-unselectable { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -.odin-kill-padding { - padding: 0; -} - -.odin-input-group { - padding-left: 15px !important; - padding-right: 15px !important; -} - -.odin-closable .fa { - font-size: 1.5em; - margin-top: -1px; -} - -.odin-closable .fa:hover:before { - content: "\f057"; -} - -/* - Odin Toolbar -*/ -.odin-toolbar { - padding-left: 1px; - padding-bottom: 4px; -} - -.odin-toolbar .odin-btn { - float: none !important; -} - -.odin-btn { - min-width: 112px; - margin-right: 3px; -} - -@media (min-width: 768px) { - .odin-btn { - min-width: 150px; - } -} - -/* - Odin Paginator -*/ -.odin-paginator { - margin: 5px 0 0; - text-align: center; -} - -.odin-paginator-content { - display: inline-block; -} - -.odin-paginator-content a { - cursor: pointer; - color: black; - float: left; - padding: 6px 16px; - text-decoration: none; - transition: background-color .3s; - border-radius: 4px; -} - -.odin-paginator-content i { - color: black; - float: left; - padding: 6px 16px; -} - -.odin-paginator-content a.active { - background-color: #4CAF50; - color: white; -} - -.odin-paginator-content a:hover:not(.active) { - background-color: #ddd; -} - -/* - Odin Formatters -*/ -.odin-negative { - color: red; - font-weight: bold; -} - -/* - Odin Table -*/ -.odin-table { - min-height: 324px; - border: 1px solid #ddd; - padding: 0; - margin: 0 0 0 1px; - background-color: #f8f8f8; -} - -.odin-table > table { - margin-bottom: 0; -} - -.odin-table > table > tbody > tr { - background-color: #fff; -} - -.odin-table-pointed-line { - cursor: pointer; -} - -.odin-table-selected-line { - background-color: #5bc0de !important; -} - -.odin-table-selected-line:hover { - background-color: #6bd0ee !important; -} - -/* - Odin Form - */ -.odin-form { - display: none; - position: absolute; - width: 100%; - height: 100%; - overflow: hidden; - top: 0; - left: 0; - bottom: 0; - right: 0; - z-index: 1500; - background: rgba(0, 0, 0, 0.5); -} - -.odin-form .panel { - position: relative; - max-height: 95%; - max-width: 95%; - overflow: auto; -} - -@media (min-width: 768px) { - .odin-form .panel { - max-width: 55%; - } -} - -.odin-form .panel-footer { - padding: 5px 7px; -} - -.odin-form .odin-btn { - float: right; -} - -.odin-checkbox { - width: 20px; - height: 20px; -} - -.odin-form .tab-pane { - padding-top: 5px; -} - -/* - Odin Confirm Box - */ -.odin-confirm-box { - display: none; - position: absolute; - width: 100%; - height: 100%; - overflow: hidden; - top: 0; - left: 0; - bottom: 0; - right: 0; - z-index: 2000; - background: rgba(0, 0, 0, 0.5); -} - -.odin-confirm-box .panel { - position: relative; - max-width: 95%; -} - -.odin-confirm-box .panel-footer { - text-align: center; -} - -@media (min-width: 768px) { - .odin-confirm-box .panel { - max-width: 25%; - } -} - -.odin-confirm-box .panel-body { - text-align: center; -} - -/* - Odin Table Box - */ -.odin-table-box { - z-index: 2500; -} - -/* - Odin Simple Box - */ - -@media (min-width: 768px) { - .odin-simple-form .panel { - max-width: 35%; - } -} \ No newline at end of file diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index b055513..778f774 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -11,8 +11,8 @@ NG-Tracker - - + + @@ -23,14 +23,13 @@ - - - - + + + - + @@ -109,7 +108,6 @@ - + + + diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html index 47c5b62..6820984 100644 --- a/src/main/resources/templates/papers/paper.html +++ b/src/main/resources/templates/papers/paper.html @@ -1,7 +1,9 @@ + xmlns:th="http://www.thymeleaf.org" + layout:decorate="~{default}" + xmlns="http://www.w3.org/1999/html"> @@ -65,7 +67,7 @@
- + @@ -89,8 +91,8 @@ + $('#addDeadline').click();|"> +
@@ -100,8 +102,7 @@
+ value="Добавить дедлайн"/>
@@ -117,26 +118,15 @@ class="alert alert-danger">Incorrect title

-
- - -
- -
-
- - -
-
- -
- +
+ +
-
+
diff --git a/src/test/java/ru/ulstu/test/StreamApiUtilsTest.java b/src/test/java/ru/ulstu/test/StreamApiUtilsTest.java index cb08287..a5ed5ef 100644 --- a/src/test/java/ru/ulstu/test/StreamApiUtilsTest.java +++ b/src/test/java/ru/ulstu/test/StreamApiUtilsTest.java @@ -16,12 +16,4 @@ public class StreamApiUtilsTest { assertEquals(integersInitial, integers); } - - @Test - public void filedTestMappingByDay() { - List integersInitial = List.of(1); - List integers = StreamApiUtils.convert(List.of("1", "2"), Integer::valueOf); - - assertEquals(integersInitial, integers); - } }