Fixed some small issues

diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index 3cf7e8985dec922bb80b5491a01748adc5062198..34743942a1becdc48ece25ac162f57eb530e4102 100644 (file)
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -2,21 +2,21 @@
 <!-- HEADER -->
 <header id="pageHeader" class="layoutFluid">
        <div>
-               {hascontent}
-                       <!-- top menu -->
-                       <nav id="topMenu" class="userPanel">
-                               <div class="layoutFluid clearfix">
+               <!-- top menu -->
+               <nav id="topMenu" class="userPanel">
+                       <div class="layoutFluid clearfix">
+                               {hascontent}
                                        <ul class="userPanelItems">
                                                {content}{event name='topMenu'}{/content}
                                        </ul>
-                                       
-                                       <!-- search area -->
-                                       {event name='searchArea'}
-                                       <!-- /search area -->
-                               </div>
-                       </nav>
-                       <!-- /top menu -->
-               {/hascontent}
+                               {/hascontent}
+                               
+                               <!-- search area -->
+                               {event name='searchArea'}
+                               <!-- /search area -->
+                       </div>
+               </nav>
+               <!-- /top menu -->
                
                <!-- logo -->
                <div id="logo" class="logo">

diff --git a/wcfsetup/install/files/lib/system/mail/Mail.class.php b/wcfsetup/install/files/lib/system/mail/Mail.class.php
index 23448446ed171a702e2ff2f92db19cd49f027075..0cb7329196de0ce09d795be38ccc36a96f510fc4 100644 (file)
--- a/wcfsetup/install/files/lib/system/mail/Mail.class.php
+++ b/wcfsetup/install/files/lib/system/mail/Mail.class.php
@@ -6,8 +6,8 @@ use wcf\util\StringUtil;
 /**
  * This class represents an e-mail.
  * 
- * @author     Michael Schaefer
- * @copyright  2001-2011 WoltLab GmbH
+ * @author     Marcel Werk
+ * @copyright  2001-2012 WoltLab GmbH
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    com.woltlab.wcf
  * @subpackage data.mail
@@ -15,17 +15,17 @@ use wcf\util\StringUtil;
  */
 class Mail {
        protected $header = '';
-       protected $boundary;
+       protected $boundary = '';
        protected $contentType = "text/plain";
-       protected $to;
-       protected $subject;
-       protected $message;
-       protected $from;
-       protected $cc;
-       protected $bcc;
+       protected $to = array();
+       protected $subject = '';
+       protected $message = '';
+       protected $from = array();
+       protected $cc = array();
+       protected $bcc = array();
        protected $attachments = array();
-       protected $priority;
-       protected $body;
+       protected $priority = 3;
+       protected $body = '';
        
        public static $crlf = "\n";
 

diff --git a/wcfsetup/install/files/style/alerts.less b/wcfsetup/install/files/style/alerts.less
index 3497f94ea6767fce27e105307b2553c4b36729ff..8df228fc30d14fe77720a9986ab62b94d6d9f8fb 100644 (file)
--- a/wcfsetup/install/files/style/alerts.less
+++ b/wcfsetup/install/files/style/alerts.less
@@ -98,7 +98,7 @@
        color: @wcfErrorColor;
        display: table !important;
        line-height: 1.5;
-       margin-top: 5px;
+       margin-top: 7px;
        padding: 2px 10px;
        position: relative; /* Firefox support (from version 10 on) is buggy */
        

diff --git a/wcfsetup/install/files/style/button.less b/wcfsetup/install/files/style/button.less
index 78a0a92e0e9f2ad2772d51a9386de6fd043ed344..16db4605d97fe827a040da3cd292e23b43e1e26a 100644 (file)
--- a/wcfsetup/install/files/style/button.less
+++ b/wcfsetup/install/files/style/button.less
@@ -122,11 +122,18 @@ button.active:hover {
        input[type='submit'],
        input[type='button'],
        .button {
-               font-size: 75% !important;
-               padding: 3px 7px;
+               font-size: @wcfSmallFontSize;
+               padding: 5px 11px;
        }
 }
 
+.button.small {
+       font-size: @wcfSmallFontSize;
+       padding: 5px 11px;
+       
+       .borderRadius(3px);
+}
+
 /* button icons */
 .button > img {
        margin: -5px 1px -5px -5px;

diff --git a/wcfsetup/install/files/style/user.less b/wcfsetup/install/files/style/user.less
index e9e7a55c35ad99f96a3ff20af18f44c0473b56d3..09d7b2a63e36823d10135f0fa8ca05366f72d525 100644 (file)
--- a/wcfsetup/install/files/style/user.less
+++ b/wcfsetup/install/files/style/user.less
@@ -147,8 +147,6 @@
                > .button {
                        min-width: 1.2em;
                        text-align: center;
-                       
-                       .borderRadius(3px);
                }
        }
 }
\ No newline at end of file