Merge pull request #1155 from smfrunic/release-2.1

Small things irk me, fixes alignment in header and admin panel

Themes/default/css/index.css

@@ -1081,7 +1081,7 @@ img.sort, .sort {
 }
 /* Level 1 button background. */
 .dropmenu li, #top_info > li {
-	margin: 0 2px 0 2px;
+	margin: 0 2px 0 1px;
 	padding: 0 0 0.3em 0;
 	float: left;
 	font-size: 0.9em;
@@ -1498,7 +1498,7 @@ img.sort, .sort {
 	padding: 1px;
 }
 #search_form .button_submit {
-	margin: 2px 5px;
+	margin: 2px 10px 2px 5px;
 	padding: 1px 2px;
 	border-radius: 3px;
 	color: #333;
@@ -1531,7 +1531,7 @@ h1.forumtitle {
 	font-size: 1.8em;
 	font-family: "Tahoma", sans-serif;
 	margin: 0;
-	padding: 22px 12px 6px 12px;
+	padding: 22px 12px 6px 10px;
 	float: left;
 	font-weight: normal;
 }
@@ -1542,7 +1542,7 @@ h1.forumtitle a {
 /* Float these items to the right */
 #siteslogan, img#smflogo {
 	margin: 0;
-	padding: 0;
+	padding-right: 2px;
 	float: right;
 	line-height: 50px;
 	font-size: 1.8em;
@@ -1551,6 +1551,11 @@ h1.forumtitle a {
 img#smflogo {
 	margin: 16px 0 0 0;
 }
+/* Even guests need to be aligned */
+.welcome
+{
+	padding-left: 10px;
+}
 /*
 /* The user info, news, etc.*/
 #upper_section {
@@ -1592,6 +1597,7 @@ ul li.greeting {
 #guest_form {
 	overflow: hidden;
 	font-size: 0.9em;
+	margin-left: -2px;
 }
 /* News section. */
 #inner_wrap .news {
@@ -3136,7 +3142,7 @@ tr.windowbg td, tr.windowbg2 td, tr.highlight2 td {
 }
 .descbox  {
 	text-align: left;
-	padding: 7px 10px 7px 35px;
+	padding: 7px 10px 7px 10px;
 	border: 1px solid #c5c5c5;
 	border-radius: 7px;
 	margin: 6px 0;

Themes/default/index.template.php

@@ -212,7 +212,7 @@ function template_body_above()
 	// Otherwise they're a guest. Ask them to either register or login.
 	else
 		echo '
-			<ul class="floatleft">
+			<ul class="floatleft welcome">
 				<li>', sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $scripturl . '?action=login'), '</li>
 			</ul>';