Merged login block tidy-up from stable

diff --git a/blocks/login/styles.php b/blocks/login/styles.php
index e91a0b31c3ea3c501fbae2e67b57014230732e98..25d62c683de6720468a08b21bd5d30b27cea26d8 100644 (file)
--- a/blocks/login/styles.php
+++ b/blocks/login/styles.php
@@ -5,3 +5,17 @@
 .block_login .loginform {
   display:inline;
 }
+
+
+.block_login .loginform .c1 input {
+  width: 6em;
+}
+
+.block_login .loginform div {
+  margin:0.3em 0.8em;
+  text-align:right;
+}
+
+.block_login .btn input {
+  text-align:center;
+}

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index c4152c911f13c596488c28ed84f1a6b4019fff45..6d7a23ccc1733f207bfeb34455e823c69aa348de 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1993,14 +1993,6 @@ body#grade-index .grades .weighted {
   padding-bottom:2000px;
 }
 
-.block_login .loginform div {
-  margin:0.3em 0.8em;
-  text-align:left;
-}
-
-.block_login .btn input {
-  text-align:center;
-}
 
 /***
  *** Message