Merge pull request #844 from AaronVanGeffen/release-2.1

Minor template and language changes

Themes/default/css/index.css

@@ -675,6 +675,15 @@ div.pagesection div.floatright input, div.pagesection div.floatright select {
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 }
 
+.under_message {
+	overflow: visible;
+}
+.under_message:after {
+	clear: both;
+	content: "";
+	display: block;
+}
+
 /* While we're doing stuff under the message, time to do some likes stuff. */
 .like_button .like, .like_button .unlike {
 	width: 16px;
@@ -837,7 +846,7 @@ dl.settings dt a img {
 h3.catbg, h3.catbg2, h3.titlebg, h4.titlebg, h4.catbg {
 	overflow: hidden;
 	font-size: 1.1em;
-	font-family: tahoma;/* @todo */
+	font-family: "Tahoma", sans-serif;
 	font-weight: bold;
 	line-height: 1.5em;
 	padding: 8px;
@@ -1465,7 +1474,7 @@ img.sort, .sort {
 /* The main title. */
 h1.forumtitle {
 	font-size: 1.8em;
-	font-family: tahoma;
+	font-family: "Tahoma", sans-serif;
 	margin: 0;
 	padding: 22px 12px 6px 12px;
 	float: left;
@@ -1473,7 +1482,7 @@ h1.forumtitle {
 }
 h1.forumtitle a {
 	color: #a85400;
-	text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5), 1px 1px 0 #fff;
+	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
 }
 /* Float these items to the right */
 #siteslogan, img#smflogo {
@@ -2287,7 +2296,7 @@ div#pollmoderation {
 }
 .inner {
 	padding: 7px 8px 2px 2px;
-	margin: 0 8px 0 0;
+	margin: 0;
 	border-top: 1px solid #bfbfbf;
 	box-shadow: 0 1px 0 #fff inset;
 	min-height: 85px;

Themes/default/index.template.php

@@ -462,7 +462,7 @@ function template_menu()
 	{
 		echo '
 						<li id="button_', $act, '"', !empty($button['sub_buttons']) ? ' class="subsections"' :'', '>
-							<a class="', $button['active_button'] ? 'active' : '', '" href="', $button['href'], '"', isset($button['target']) ? ' target="' . $button['target'] . '"' : '', '>
+							<a', $button['active_button'] ? ' class="active"' : '', ' href="', $button['href'], '"', isset($button['target']) ? ' target="' . $button['target'] . '"' : '', '>
 								', $button['title'], '
 							</a>';
 		if (!empty($button['sub_buttons']))

Themes/default/languages/Admin.english.php

@@ -37,7 +37,7 @@ $txt['admin_config'] = 'Configuration';
 $txt['admin_version_check'] = 'Detailed version check';
 $txt['admin_smffile'] = 'SMF File';
 $txt['admin_smfpackage'] = 'SMF Package';
-$txt['admin_logoff'] = 'Admin End Session';
+$txt['admin_logoff'] = 'End Admin Session';
 $txt['admin_maintenance'] = 'Maintenance';
 $txt['admin_image_text'] = 'Show buttons as images instead of text';
 $txt['admin_credits'] = 'Credits';

Themes/default/languages/ModerationCenter.english.php

@@ -148,7 +148,7 @@ $txt['mc_prefs_notify_report_never'] = 'Never';
 $txt['mc_prefs_notify_report_moderator'] = 'Only if it\'s a board I moderate';
 $txt['mc_prefs_notify_report_always'] = 'Always';
 $txt['mc_prefs_notify_approval'] = 'Notify of items awaiting approval';
-$txt['mc_logoff'] = 'Moderator End Session';
+$txt['mc_logoff'] = 'End Moderator Session';
 
 // Use entities in the below string.
 $txt['mc_click_add_note'] = 'Add a new note';