From fefc34790a10b726d94fc9117f28ae68d0f2685e Mon Sep 17 00:00:00 2001 From: jooola Date: Fri, 26 May 2017 18:48:57 +0200 Subject: [PATCH] Many improvement and moved CSS to default.css - Changed to html5 (remove align="center" > style="text-align=center" - Removed table clean up - Moved the login message under the logo, and centered it --- .../src/main/webapp/WEB-INF/jsp/login.jsp | 67 +++++++++---------- .../src/main/webapp/style/default.css | 45 ++++++++++++- 2 files changed, 72 insertions(+), 40 deletions(-) diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp index d4f83470..08b4d80e 100644 --- a/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> - + <%@ include file="head.jsp" %> @@ -12,57 +12,50 @@ -
" method="POST"> + " method="POST"> + - -
+
-
+ " alt=""> - - - - +
- - - + "> - - - + "> - - - + " tabindex="4"> - - - +
+
+ + +
+ + +
- +
+ +
- +
+ +
-
- " alt=""> -
">
">
" tabindex="4">
-
- - - -
-
+ +
+

+
+ - -

- +
+ -
- diff --git a/libresonic-main/src/main/webapp/style/default.css b/libresonic-main/src/main/webapp/style/default.css index bb5131b1..0564a919 100644 --- a/libresonic-main/src/main/webapp/style/default.css +++ b/libresonic-main/src/main/webapp/style/default.css @@ -106,18 +106,57 @@ h2, h2 a, .topHeader a { font-weight: normal; } -#loginButton { +/* Login page */ + +#loginframe { + padding: 20px 50px; + margin: 100px 50px; + display: list-item; + list-style: none; + text-align: center; +} + +#loginframe > * { + margin: 0 auto; + display: block; +} + +#loginframe .loginmessagetop { + margin-bottom: 1em; + max-width: 30rem; +} + +#loginframe input[type=text], +#loginframe input[type=submit], +#loginframe input[type=password] { + width: 20rem; + margin-bottom: 0.5em; +} + +#loginframe input[type=submit] { + margin: 1rem auto; + padding: 0.3rem; background: #2f7bd9; color: #f2f2f2; - cursor: pointer; transition: color 0.2s ease, background 0.2s ease; } -#loginButton:hover { +#loginframe input[type=submit]:hover { background: #f2f2f2; color: #2d2d2d; } +#loginremember { + display: inline-flex; + align-items: center; + margin-right: 10px; +} + +#loginframe .loginmessagebottom { + margin-top: 1em; + max-width: 50em; +} + /*************************************************************************************** * The rest of the CSS is typically not changed in other themes (but not necessarily so). ***************************************************************************************/