diff --git a/.gitignore b/.gitignore index 8d929bf..0364181 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ postgres/docker-compose.yml +target/ diff --git a/src/main/resources/static/styles/styles.css b/src/main/resources/static/styles/styles.css index 6cb41b9..dbcef51 100644 --- a/src/main/resources/static/styles/styles.css +++ b/src/main/resources/static/styles/styles.css @@ -4,13 +4,20 @@ } body { - margin-top: 0; - margin-bottom: 0; - margin-right: 0; - margin-left: 0; font-family: Terminus; background-color: #212121; color: #cfcfcf; + margin: 0; + padding: 0; + height: 100vh; + display: flex; + flex-direction: column; +} + +.page{ + flex: 1 0 auto; + padding: 0 0 0; + width: 100%; } .validationError { @@ -178,4 +185,47 @@ button:hover { margin-left: auto; margin-right: auto; width: 25em; +} + +/* footer */ +.footer{ + background: #323833; + color: #a7a691; + margin-top: 20px; + width: 100%; +} +.inner_footer{ + padding: 10px; + display: block; + float: right; +} +.copy_link{ + font-family: sans-serif; + text-shadow: -1px -1px 0 #1e1e1e, 1px -1px 0 #1e1e1e, -1px 1px 0 #1e1e1e, 1px 1px 0 #1e1e1e; + color: #74bfbd; +} +.copy_link:hover { + color: #b6a795; +} + +/* error */ +.error { + text-align: center; + background: #283338; + padding: 20px; + box-shadow: 0 0 8px -3px #37474e; + border-radius: 3px; + margin: auto; +} + +.bli { + padding: 3px; + background-color: #D00000; + animation: blinker 2.5s ease infinite; +} + +@keyframes blinker { + 50% { + opacity: 0.0; + } } \ No newline at end of file diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index 8c0dabd..6de9ca6 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -3,50 +3,19 @@ - + + title
- ОШИБКА: + + Marinesco + +

+ ОШИБКА +

diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 20d7d41..6d41009 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,10 +1,19 @@ - - - -
- © 2023 Dmitry Isaenko -
- + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 43476f7..cb4bd3f 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -9,25 +9,29 @@
-
-
-

Log in

- Register - +
+
+
+

Log in

+ Register + +
+
\ No newline at end of file diff --git a/src/main/resources/templates/manage_users.html b/src/main/resources/templates/manage_users.html index 77ae670..5f9e7d4 100644 --- a/src/main/resources/templates/manage_users.html +++ b/src/main/resources/templates/manage_users.html @@ -8,28 +8,31 @@ -
-
-

-

-

- user - - user - -
- - - +
+
+
+

+

+

+ user - + user + + + + + + + - - -
+ + +
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html index 048fac9..7f2fbee 100644 --- a/src/main/resources/templates/registration.html +++ b/src/main/resources/templates/registration.html @@ -9,41 +9,46 @@ -
-
-

Register

-
+
+
+
+

Register

+ - Error -
- -
-
+ Error +
+ +
+
- Error -
- -
-
+ Error +
+ +
+
- false -
- -
-
+ false +
+ +
+
- Error -
- -
-
-

- -

- + Error +
+ +
+
+

+ +

+ +
+
\ No newline at end of file diff --git a/src/main/resources/templates/root.html b/src/main/resources/templates/root.html index 923c48f..7378f45 100644 --- a/src/main/resources/templates/root.html +++ b/src/main/resources/templates/root.html @@ -8,14 +8,17 @@ -
-
- -
Login -
/profile -
/manage_users -
H2 +
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/user_settings.html b/src/main/resources/templates/user_settings.html index da1c88e..850caa0 100644 --- a/src/main/resources/templates/user_settings.html +++ b/src/main/resources/templates/user_settings.html @@ -8,28 +8,31 @@ -
-
-

welcome

-
- Error -
- -
-
+
+
+
+

welcome

+ + Error +
+ +
+
- false -
- -
-
+ false +
+ +
+
- - + + +
+
\ No newline at end of file