diff --git a/src/main/resources/static/styles/styles.css b/src/main/resources/static/styles/styles.css index cb2e427..1f9c20e 100644 --- a/src/main/resources/static/styles/styles.css +++ b/src/main/resources/static/styles/styles.css @@ -1,39 +1,44 @@ -@font-face{ +@font-face { font-family: "Terminus"; src: url('/styles/TerminusBold.ttf'); } -body { +body { margin-top: 0; margin-bottom: 0; margin-right: 0; margin-left: 0; - font-family: Terminus; + font-family: Terminus; background-color: #212121; color: #cfcfcf; } .validationError { - color: red; -} -.header-container { - text-align: left; - position: relative; -} -.header-container .header-bar { - position: absolute; - right: 10px; + color: red; } -table, th, td { - border: 1px solid; - border-collapse: collapse; +.header-container { + text-align: left; + position: relative; +} + +.header-container .header-bar { + position: absolute; + right: 10px; +} + +table, +th, +td { + border: 1px solid; + border-collapse: collapse; } a { - color: #cfcfcf; + color: #cfcfcf; text-align: center; } + a:link { color: #cfcfcf; } @@ -46,32 +51,35 @@ a:visited { color: #949494; } -ul{ +ul { list-style-type: none; } -header{ +header { display: block; } -.header_wrapper{ - background:#323833; + +.header_wrapper { + background: #323833; color: #a7a691; vertical-align: top; - width:100%; - padding:0px; + width: 100%; + padding: 0px; margin-bottom: 20px; display: inline-block; } -.container{ + +.container { width: 100%; max-width: 1280px; margin: 0 auto; } -.header_branding{ +.header_branding { float: left; } -#header_right_block{ + +#header_right_block { list-style-type: none; list-style-image: none; font-family: sans-serif; @@ -82,14 +90,21 @@ header{ padding: 0%; font-size: 0.9em; } -.ul_right_block{ + +.ul_right_block { margin: 0 !important; padding: 0 !important; } -.li_right_block{ + +.li_right_block { + margin-left: 5px; + margin-right: 5px; height: 100%; + float: left; + position: relative; } -.header_entry{ + +.header_entry { height: 65px; line-height: 65px; display: block; @@ -98,26 +113,68 @@ header{ text-decoration: none; font-variant: small-caps; text-shadow: -1px -1px 0 #1e1e1e, 1px -1px 0 #1e1e1e, -1px 1px 0 #1e1e1e, 1px 1px 0 #1e1e1e; - color:#74bfbd; + color: #74bfbd; } -.header_entry_link:hover{ + +.header_entry_link:hover { color: #b6a795; } -.block{ + +.block { display: block; } -.block_inner{ + +.block_inner { margin-left: 10px; margin-right: 10px; } -a.entry{ + +a.entry { text-decoration: none; } -.header_title{ + +.header_title { font-size: 1.5em; } -hr{ - border: 0; + +hr { + border: 0; border-bottom: 1px dashed; background: none; +} + +button { + margin: 1em 0; + font-family: sans-serif; + font-style: normal; + font-weight: normal; + text-align: center; + font-variant: small-caps !important; + background-color: #b0c6af !important; + border: none; + border-radius: 2px; + padding: 5px 25px 5px 25px; + color: #4a3c3c; +} +button:hover { + background-color: #c2dac0 !important; +} + +.sign { + width: 25%; +} + +.base { + background: #283338; + padding: 20px; + box-shadow: 0 0 8px -3px #37474e; + border-radius: 3px; + width: 100%; + flex: 1; +} + +.center{ + margin-left: auto; + margin-right: auto; + width: 25em; } \ No newline at end of file diff --git a/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html index 1da765e..12bbeef 100644 --- a/src/main/resources/templates/registration.html +++ b/src/main/resources/templates/registration.html @@ -9,6 +9,7 @@ +

Register

diff --git a/target/classes/static/styles/styles.css b/target/classes/static/styles/styles.css index cb2e427..1f9c20e 100644 --- a/target/classes/static/styles/styles.css +++ b/target/classes/static/styles/styles.css @@ -1,39 +1,44 @@ -@font-face{ +@font-face { font-family: "Terminus"; src: url('/styles/TerminusBold.ttf'); } -body { +body { margin-top: 0; margin-bottom: 0; margin-right: 0; margin-left: 0; - font-family: Terminus; + font-family: Terminus; background-color: #212121; color: #cfcfcf; } .validationError { - color: red; -} -.header-container { - text-align: left; - position: relative; -} -.header-container .header-bar { - position: absolute; - right: 10px; + color: red; } -table, th, td { - border: 1px solid; - border-collapse: collapse; +.header-container { + text-align: left; + position: relative; +} + +.header-container .header-bar { + position: absolute; + right: 10px; +} + +table, +th, +td { + border: 1px solid; + border-collapse: collapse; } a { - color: #cfcfcf; + color: #cfcfcf; text-align: center; } + a:link { color: #cfcfcf; } @@ -46,32 +51,35 @@ a:visited { color: #949494; } -ul{ +ul { list-style-type: none; } -header{ +header { display: block; } -.header_wrapper{ - background:#323833; + +.header_wrapper { + background: #323833; color: #a7a691; vertical-align: top; - width:100%; - padding:0px; + width: 100%; + padding: 0px; margin-bottom: 20px; display: inline-block; } -.container{ + +.container { width: 100%; max-width: 1280px; margin: 0 auto; } -.header_branding{ +.header_branding { float: left; } -#header_right_block{ + +#header_right_block { list-style-type: none; list-style-image: none; font-family: sans-serif; @@ -82,14 +90,21 @@ header{ padding: 0%; font-size: 0.9em; } -.ul_right_block{ + +.ul_right_block { margin: 0 !important; padding: 0 !important; } -.li_right_block{ + +.li_right_block { + margin-left: 5px; + margin-right: 5px; height: 100%; + float: left; + position: relative; } -.header_entry{ + +.header_entry { height: 65px; line-height: 65px; display: block; @@ -98,26 +113,68 @@ header{ text-decoration: none; font-variant: small-caps; text-shadow: -1px -1px 0 #1e1e1e, 1px -1px 0 #1e1e1e, -1px 1px 0 #1e1e1e, 1px 1px 0 #1e1e1e; - color:#74bfbd; + color: #74bfbd; } -.header_entry_link:hover{ + +.header_entry_link:hover { color: #b6a795; } -.block{ + +.block { display: block; } -.block_inner{ + +.block_inner { margin-left: 10px; margin-right: 10px; } -a.entry{ + +a.entry { text-decoration: none; } -.header_title{ + +.header_title { font-size: 1.5em; } -hr{ - border: 0; + +hr { + border: 0; border-bottom: 1px dashed; background: none; +} + +button { + margin: 1em 0; + font-family: sans-serif; + font-style: normal; + font-weight: normal; + text-align: center; + font-variant: small-caps !important; + background-color: #b0c6af !important; + border: none; + border-radius: 2px; + padding: 5px 25px 5px 25px; + color: #4a3c3c; +} +button:hover { + background-color: #c2dac0 !important; +} + +.sign { + width: 25%; +} + +.base { + background: #283338; + padding: 20px; + box-shadow: 0 0 8px -3px #37474e; + border-radius: 3px; + width: 100%; + flex: 1; +} + +.center{ + margin-left: auto; + margin-right: auto; + width: 25em; } \ No newline at end of file diff --git a/target/classes/templates/login.html b/target/classes/templates/login.html index baa9d71..43476f7 100644 --- a/target/classes/templates/login.html +++ b/target/classes/templates/login.html @@ -2,30 +2,32 @@ - Marinesco - - + Marinesco + +
- +
+
+

Log in

+ Register + +
Unable to login. Check your username and + password. +

+ + +

+

+ + +

+ + +
+
-
-
New here? REGISTER NOW! -
H2 -
- -
Unable to login. Check your username and password. -

- - -

-

- - -

- -
-
+ \ No newline at end of file diff --git a/target/classes/templates/manage_users.html b/target/classes/templates/manage_users.html index fa741ce..77ae670 100644 --- a/target/classes/templates/manage_users.html +++ b/target/classes/templates/manage_users.html @@ -9,24 +9,27 @@
-

-

-

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

+

+

+ user - + user - - - -
+
+ + + + + + + + +
+
+
+ \ No newline at end of file diff --git a/target/classes/templates/registration.html b/target/classes/templates/registration.html index 1da765e..d871657 100644 --- a/target/classes/templates/registration.html +++ b/target/classes/templates/registration.html @@ -9,32 +9,41 @@ -

Register

- -
- - Error -
- -
+
+
+

Register

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

+ +

+ +
\ No newline at end of file diff --git a/target/classes/templates/root.html b/target/classes/templates/root.html index b70db9a..923c48f 100644 --- a/target/classes/templates/root.html +++ b/target/classes/templates/root.html @@ -9,10 +9,13 @@
- -
Login -
/profile -
/manage_users +
+ +
Login +
/profile +
/manage_users +
H2 +
\ No newline at end of file diff --git a/target/classes/templates/user_settings.html b/target/classes/templates/user_settings.html index 80c57b3..96169ec 100644 --- a/target/classes/templates/user_settings.html +++ b/target/classes/templates/user_settings.html @@ -9,19 +9,25 @@
+

welcome

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