diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 0bb51b4b2..21c9e1e71 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -11,7 +11,7 @@ html.cp, .cp body { color: @fore; font-family: Georgia,Cambria,serif; - height: 100%; + height: 100; } .cp { @@ -170,6 +170,11 @@ p, pre, td, a, table, tr { line-height: 1.5em; } +// currently only used in /user/ +.panel { + background-color: #333; +} + /* Tables * Currently only used by /poll/ */ diff --git a/www/user/index.html b/www/user/index.html index fb4e5fb3f..5f27377ba 100644 --- a/www/user/index.html +++ b/www/user/index.html @@ -15,19 +15,18 @@ box-sizing: border-box; } body { - padding-top: 50px; + padding: 45px; } - div.box { + div.panel{ width: 70%; margin: auto; border: 1px solid black; padding: 15px; display: none; - background-color: #333; border-radius: 5px; } @media (max-width: 1000px) { - div.box { width: 90%; } + div.panel { width: 90%; } } input[type="text"], input[type="password"] { width: 80%; @@ -38,7 +37,7 @@ margin-bottom: 45px; } - #notice-box { + #notice-panel { text-align: center; font-size: 25px; } @@ -46,7 +45,7 @@ -
+


@@ -55,11 +54,11 @@
-
+

-
+

@@ -72,12 +71,12 @@
-
+
-
+

diff --git a/www/user/main.js b/www/user/main.js index 44573e541..fc159e314 100644 --- a/www/user/main.js +++ b/www/user/main.js @@ -21,14 +21,14 @@ define([ var $warning = $('#warning'); // login elements - var $loginBox = $('#login-box'); + var $loginBox = $('#login-panel'); var $login = $('#login'); var $username = $('#username'); var $password = $('#password'); var $remember = $('#remember'); // hashing elements - var $noticeBox = $('#notice-box'); + var $noticeBox = $('#notice-panel'); var $notice = $('#notice'); APP.setNotice = function (s) { @@ -36,17 +36,17 @@ define([ }; // confirm elements - var $confirmBox = $('#confirm-box'); + var $confirmBox = $('#confirm-panel'); var $confirm = $('#confirm'); var $cancelRegister = $('#cancel-register'); var $register = $('#register'); // log out elements - var $logoutBox = $('#logout-box'); + var $logoutBox = $('#logout-panel'); var $logout = $('#logout'); // user elements - var $userBox = $('#user-box'); + var $userBox = $('#user-panel'); var $displayNameLabel = $('#display-name'); var $userNameLabel = $('#user-name');