3 files changed, 40 insertions, 24 deletions
diff --git a/skins/default/common.css b/skins/default/common.css
index 631321c72..4e520fff5 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -277,7 +277,7 @@ a.button-logout
 .boxtitle
 {
   height: 12px !important;
-  padding: 4px 20px 3px 20px;
+  padding: 2px 10px 5px 10px;
   border-bottom: 1px solid #999;
   color: #333;
   font-size: 11px;
@@ -457,3 +457,30 @@ a.rcmContactAddress:hover
   background-color: #CC3333;
 }
 
+#login-form
+{
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+  width: 400px;
+  border: 1px solid #999;
+}
+
+#login-form table td.title
+{
+  color: #666;
+  text-align: right;
+  padding-right: 10px;
+  white-space: nowrap;
+}
+
+#login-form table
+{
+  width: 1%;
+  margin: auto;
+}
+
+#login-form .boxcontent
+{
+  padding: 20px 10px 10px 10px;
+}
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 6c984ab67..26b4f2cdb 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -139,6 +139,11 @@ span.tablink-selected a
   width: expression('auto');
 }
 
+#subscription-table input
+{
+  font: inherit;
+}
+
 #subscription-table tbody td,
 #identities-table tbody td
 {
@@ -196,6 +201,12 @@ span.tablink-selected a
   width: 30px;
 }
 
+#subscription-table td.name input
+{
+  font: inherit;
+  width: 240px;
+}
+
 #identity-frame
 {
   position: relative;
@@ -244,7 +255,7 @@ input.disabled
 div.boxtitle
 {
   height: 12px !important;
-  padding: 4px 20px 3px 6px;
+  padding: 2px 10px 5px 10px;
   border-bottom: 1px solid #999999;
   color: #333333;
   font-size: 11px;
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index d16a08fdd..8ffe9d274 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -4,28 +4,6 @@
 <title><roundcube:object name="pagetitle" /></title>
 <meta name="Robots" content="noindex,nofollow" />
 <roundcube:include file="/includes/links.html" />
-<style type="text/css">
-
-#login-form {
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 50px;
-  width: 380px;
-  border: 1px solid #999;
-}
-
-#login-form table td.title
-{
-  color: #666;
-  text-align: right;
-  padding-right: 10px;
-}
-
-.boxcontent {
-  padding: 20px 20px 10px 20px;
-}
-
-</style>
 </head>
 <body>