Przeglądaj źródła

Merge pull request #350 from Labradoodle-360/css-tweaks

More RTL Support + Issue #346 Resolved
Matthew K. 12 lat temu
rodzic
commit
15e6a4c868

+ 1 - 1
.gitignore

@@ -46,4 +46,4 @@ Thumbs.db
 /nbproject/private/
 /nbproject/
 .directory
-
+.idea/

+ 6 - 4
Themes/default/MessageIndex.template.php

@@ -253,7 +253,7 @@ function template_main()
 			// Some columns require a different shade of the color class.
 			$alternate_class = $color_class . '2';
 
-			// [WIP] Markup can be cleaned up later. CSS can go in the CSS files later.
+			// @todo - [WIP] Markup can be cleaned up later. CSS can go in the CSS files later.
 			echo '
 				<tr>
 					<td class="', $color_class, ' icon2">
@@ -264,16 +264,18 @@ function template_main()
 					</td>
 					<td class="', $alternate_class, ' subject">
 						<div ', (!empty($topic['quick_mod']['modify']) ? 'id="topic_' . $topic['first_post']['id'] . '"  ondblclick="oQuickModifyTopic.modify_topic(\'' . $topic['id'] . '\', \'' . $topic['first_post']['id'] . '\');"' : ''), '>
-							<div class="message_index_title">
-								', $topic['new'] && $context['user']['is_logged'] ? '<a href="' . $topic['new_href'] . '" id="newicon' . $topic['first_post']['id'] . '" style="float: left; display: block; margin: 9px 0 0 3px;"><span class="new_posts">' . $txt['new'] . '</span></a>' : '', '
+							<div class="message_index_title floatleft">
 								<span class="preview', $topic['is_sticky'] ? ' bold_text' : '', '" title="', $topic[(empty($settings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'], '">
 									<span id="msg_', $topic['first_post']['id'], '">', $topic['first_post']['link'], ($context['can_approve_posts'] && !$topic['approved'] ? '&nbsp;<em>(' . $txt['awaiting_approval'] . ')</em>' : ''), '</span>
 								</span>
 								<br class="clear" />
 							</div>
-							<p>', $txt['started_by'], ' ', $topic['first_post']['member']['link'], '
+							', $topic['new'] && $context['user']['is_logged'] ? '<a href="' . $topic['new_href'] . '" class="floatleft" id="newicon' . $topic['first_post']['id'] . '" style="display: block; margin: 9px 0 0 3px;"><span class="new_posts">' . $txt['new'] . '</span></a>' : '', '
+							<br class="clear" />
+							<p class="floatleft">', $txt['started_by'], ' ', $topic['first_post']['member']['link'], '
 								<small id="pages', $topic['first_post']['id'], '">', $topic['pages'], '</small>
 							</p>
+							<br class="clear" />
 						</div>
 					</td>
 					<td class="', $color_class, ' stats">

+ 7 - 2
Themes/default/css/index.css

@@ -1486,7 +1486,6 @@ ul li.greeting {
 /* News section. */
 #inner_wrap .news {
 	max-width: 50%;
-	max-width: 27em;
 	float: right;
 	overflow: auto;
 	padding: 0 0 6px 0;
@@ -1544,8 +1543,13 @@ ul li.greeting {
 	text-shadow: 1px 1px 0 #fff;
 }
 .navigate_section ul li a, .navigate_section ul li em {
-	padding: 4px 0;
+	padding: 4px 0 4px;
+	margin-top: -4px;
+	display: inline-block;
+}
+.navigate_section ul li span {
 	display: inline-block;
+	margin-top: 8px;
 }
 .navigate_section ul li .dividers {
 	color: #3f6b8c;
@@ -1563,6 +1567,7 @@ ul li.greeting {
 }
 .navigate_section .unread_links a {
 	padding: 4px 0 4px 10px;
+	margin-top: 4px;
 }
 /* The content section */
 #content_section {

+ 12 - 13
Themes/default/css/rtl.css

@@ -63,7 +63,7 @@ a.collapse img {
 }
 
 .button_submit, .button_reset, .button_link {
-	margin: 0;
+	margin: 0 2x;
 }
 
 /* BoardIndex Styling for RTL */
@@ -133,10 +133,6 @@ table.table_list a.collapse {
 }
 .dropmenu li ul {
 	right: -999em;
-	background: #fff url(../images/theme/menu_gfx.png) -30px -137px repeat-x;
-	/* Note: Using a black rgba box-shadow with suitable
-	alpha value gives the best effect on any background. */
-	box-shadow: -1px 2px 2px rgba(0,0,0,0.3);
 }
 /* Note: The next two declarations are for keyboard access with js disabled. */
 .dropmenu ul a:focus {
@@ -165,15 +161,14 @@ table.table_list a.collapse {
 .dropmenu li li:hover ul, .dropmenu li li.sfhover ul {
 	right: 14.5em;
 }
-/* Indicator for additonal levels. Best in the anchor so it stays visible on hover. */
-.dropmenu li li.subsections a {
-	background: url(../images/admin/subsection_rtl.png) no-repeat 1% 40%;
-}
-/* For no-js background. */
-.dropmenu li li.subsections a:focus {
-	background:  #e3e9ef url(../images/admin/subsection_rtl.png) no-repeat 1% 40%, url(../images/theme/lower_section.png) 0 0 repeat-x;
+/* Indicator for additional levels. Best in the anchor so it stays visible on hover. */
+.dropmenu li li.subsections a:after, .adm_section .dropmenu li.subsections a:after{
+	left: 2px;
+	right: auto;
+	background: url(../images/admin/subsection_rtl.png) no-repeat;
 }
 
+
 /* The dropdown menu toggle image */
 #menu_toggle {
 	float: left;
@@ -303,6 +298,10 @@ img#upshrink_ic, img#newsupshrink {
 	float: left;
 }
 
+#message_index_jump_to label {
+	margin-left: 14px;
+}
+
 /* Styles for the display template (topic view).
 ---------------------------------------------------- */
 #postbuttons div.buttons {
@@ -404,7 +403,7 @@ ul.quickbuttons {
 }
 ul.quickbuttons li {
 	float: left;
-	margin: 0 11px 0 0;
+	margin: 0 0 0 0;
 }
 ul.quickbuttons li a {
 	padding: 0 20px 0 0;