12 files changed, 91 insertions, 109 deletions
diff --git a/plugins/password/password.php b/plugins/password/password.php
index f7d72690d..a03d3540a 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -158,9 +158,9 @@ class password extends rcube_plugin
     $table->add('title', html::label($field_id, Q($this->gettext('confpasswd'))));
     $table->add(null, $input_confpasswd->show());
 
-    $out = html::div(array('class' => "settingsbox", 'style' => "margin:0"),
-      html::div(array('id' => "prefs-title", 'class' => 'boxtitle'), $this->gettext('changepasswd')) .
-      html::div(array('style' => "padding:15px"), $table->show() .
+    $out = html::div(array('class' => 'settingsbox', 'style' => 'margin:0'),
+      html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) .
+      html::div(array('class' => 'boxcontent'), $table->show() .
         html::p(null,
           $rcmail->output->button(array(
             'command' => 'plugin.password-save',
diff --git a/skins/default/addresses.css b/skins/default/addresses.css
index 234f0c63f..4d831f84c 100644
--- a/skins/default/addresses.css
+++ b/skins/default/addresses.css
@@ -218,15 +218,8 @@ body.iframe,
   border: none;
 }
 
-#contact-details
-{
-  padding: 15px 10px 10px 10px;
-}
-
 #contact-details table td.title
 {
-  color: #666;
   font-weight: bold;
   text-align: right;
-  padding-right: 10px;
 }
diff --git a/skins/default/common.css b/skins/default/common.css
index 04377337c..eeb316211 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -318,7 +318,19 @@ img
   font-weight: bold;
   background: url('images/listheader.gif') top left repeat-x #CCC;
 }
-	      
+
+.boxcontent
+{
+  padding: 15px 10px 10px 10px;
+}
+
+.boxcontent table td.title
+{
+  color: #666;
+  padding-right: 10px;
+}
+
+
 /***** common table settings ******/
 
 table.records-table thead tr td
@@ -500,9 +512,7 @@ a.rcmContactAddress:hover
 
 #login-form table td.title
 {
-  color: #666;
   text-align: right;
-  padding-right: 10px;
   white-space: nowrap;
 }
 
@@ -512,11 +522,6 @@ a.rcmContactAddress:hover
   margin: auto;
 }
 
-#login-form .boxcontent
-{
-  padding: 20px 10px 10px 10px;
-}
-
 #rcmloginuser, #rcmloginpwd, #rcmloginhost
 {
   width: 200px;
@@ -526,3 +531,69 @@ a.rcmContactAddress:hover
 {
   opacity: 0.8;
 }
+
+
+/***** onclick menu list *****/
+
+ul.toolbarmenu
+{
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+ul.toolbarmenu li
+{
+  font-size: 11px;
+  white-space: nowrap;
+  min-width: 130px;
+}
+
+ul.toolbarmenu li a
+{
+  display: block;
+  color: #a0a0a0;
+  padding: 2px 8px 3px 22px;
+  text-decoration: none;
+  min-height: 14px;
+}
+
+ul.toolbarmenu li a.active,
+ul.toolbarmenu li a.active:active,
+ul.toolbarmenu li a.active:visited
+{
+  color: #333;
+}
+
+ul.toolbarmenu li input
+{
+  vertical-align: middle;
+}
+
+ul.toolbarmenu li hr
+{
+  color: #ccc;
+  width: 130px;
+  height: 1px;
+  margin: 2px 1px 2px 1px;
+}
+
+ul.toolbarmenu li img
+{
+  float: left;
+  margin: 0 2px;
+}
+
+ul.toolbarmenu li.separator_below
+{
+  border-bottom: 1px solid #ccc;
+  margin-bottom: 2px;
+  padding-bottom: 2px;
+}
+
+ul.toolbarmenu li.separator_above
+{
+  border-top: 1px solid #ccc;
+  margin-top: 2px;
+  padding-top: 2px;
+}
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 05b2a85b1..d594ab5e1 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -178,69 +178,6 @@
   width: 172px;
 }
 
-ul.toolbarmenu
-{
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-ul.toolbarmenu li
-{
-  font-size: 11px;
-  white-space: nowrap;
-  min-width: 130px;
-}
-
-ul.toolbarmenu li a
-{
-  display: block;
-  color: #a0a0a0;
-  padding: 2px 8px 3px 22px;
-  text-decoration: none;
-  min-height: 14px;
-}
-
-ul.toolbarmenu li a.active,
-ul.toolbarmenu li a.active:active,
-ul.toolbarmenu li a.active:visited
-{
-  color: #333;
-}
-
-ul.toolbarmenu li input
-{
-  vertical-align: middle;
-}
-
-ul.toolbarmenu li hr
-{
-  color: #ccc;
-  width: 130px;
-  height: 1px;
-  margin: 2px 1px 2px 1px;
-}
-
-ul.toolbarmenu li img
-{
-  float: left;
-  margin: 0 2px;
-}
-
-ul.toolbarmenu li.separator_below
-{
-  border-bottom: 1px solid #ccc;
-  margin-bottom: 2px;
-  padding-bottom: 2px;
-}
-
-ul.toolbarmenu li.separator_above
-{
-  border-top: 1px solid #ccc;
-  margin-top: 2px;
-  padding-top: 2px;
-}
-
 #messagemenu li a.active:hover,
 #markmessagemenu li a.active:hover
 {
diff --git a/skins/default/settings.css b/skins/default/settings.css
index cbfcb16ec..bf1ace072 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -199,10 +199,8 @@ span.tablink-selected a
 
 #identity-details table td.title
 {
-  color: #666666;
   font-weight: bold;
   text-align: right;
-  padding-right: 10px;
 }
 
 input.disabled
@@ -226,12 +224,6 @@ div.settingsbox
   border: 1px solid #999999;
 }
 
-div.settingspart
-{
-  display: block;
-  padding: 10px;
-}
-
 fieldset 
 {
   margin-bottom: 0.5em;
@@ -292,17 +284,6 @@ body.iframe,
   border: none;
 }
 
-#prefs-details
-{
-  margin: 15px;
-}
-
-#prefs-details table td.title
-{
-  color: #666;
-  padding-right: 10px;
-}
-
 #formfooter
 {
   width: 100%;
@@ -310,14 +291,14 @@ body.iframe,
 
 #formfooter .footerleft
 {
-  padding-left: 20px;
+  padding-left: 15px;
   white-space: nowrap;
   float: left;
 }
 
 #formfooter .footerright
 {
-  padding-right: 20px;
+  padding-right: 15px;
   white-space: nowrap;
   text-align: right;
   float: right;
diff --git a/skins/default/templates/addcontact.html b/skins/default/templates/addcontact.html
index 3b18ec5e7..08f5ca2b1 100644
--- a/skins/default/templates/addcontact.html
+++ b/skins/default/templates/addcontact.html
@@ -8,7 +8,7 @@
 
 <div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
 
-<div id="contact-details">
+<div id="contact-details" class="boxcontent">
 <roundcube:object name="contacteditform" size="40" />
 
 <p><br />
diff --git a/skins/default/templates/editcontact.html b/skins/default/templates/editcontact.html
index 1fc1237f8..44111959e 100644
--- a/skins/default/templates/editcontact.html
+++ b/skins/default/templates/editcontact.html
@@ -8,7 +8,7 @@
 
 <div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
 
-<div id="contact-details">
+<div id="contact-details" class="boxcontent">
 <roundcube:object name="contacteditform" size="40" />
 
 <p><br />
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index 8a37da299..0cfec60d9 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -22,7 +22,7 @@
 <div id="identity-details">
 <div id="identity-title" class="boxtitle"><roundcube:object name="steptitle" /></div>
 
-<div style="padding:15px;">
+<div class="boxcontent">
 <roundcube:object name="identityform" size="40" textareacols="60" textarearows="6" />
 
 <p><br />
diff --git a/skins/default/templates/importcontacts.html b/skins/default/templates/importcontacts.html
index 9eff96874..83ab4ab3d 100644
--- a/skins/default/templates/importcontacts.html
+++ b/skins/default/templates/importcontacts.html
@@ -12,7 +12,7 @@
 <div id="importbox">
 <div class="boxtitle"><roundcube:label name="importcontacts" /></div>
 
-<div style="padding-left:12px; width:48em">
+<div class="boxcontent">
 <roundcube:object name="importstep" />
 
 <p><br />
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index 80f5df279..97758880a 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -24,7 +24,7 @@
 <div class="settingsbox">
 <div class="boxtitle"><roundcube:label name="createfolder" /></div>
 
-<div class="settingspart">
+<div class="boxcontent">
 <roundcube:label name="foldername" />:&nbsp;
 <roundcube:object name="createfolder" form="subscriptionform" hintbox="rcmailaddfolderhint" />
 <roundcube:button command="create-folder" type="input" class="button" label="create" />
diff --git a/skins/default/templates/settingsedit.html b/skins/default/templates/settingsedit.html
index dcd5c5c2e..78ef9e279 100644
--- a/skins/default/templates/settingsedit.html
+++ b/skins/default/templates/settingsedit.html
@@ -11,7 +11,7 @@
 
 <form name="form" action="./" method="post">
 
-<div id="prefs-details">
+<div id="prefs-details" class="boxcontent">
 <roundcube:object name="userprefs" form="form" />
 </div>
 
diff --git a/skins/default/templates/showcontact.html b/skins/default/templates/showcontact.html
index e50c6031c..be663a78b 100644
--- a/skins/default/templates/showcontact.html
+++ b/skins/default/templates/showcontact.html
@@ -8,7 +8,7 @@
 
 <div id="contact-title" class="boxtitle"><roundcube:object name="contactdetails" part="name" /></div>
 
-<div id="contact-details">
+<div id="contact-details" class="boxcontent">
 <roundcube:object name="contactdetails" />
 
 <p><br /><roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" /></p>