Sfoglia il codice sorgente

! fix the formating of shortcut text in posts and PM's (move below hr, remove double hr caused by bottom border in css
! sticky and locked tr's could get wrong background color due to use of shorthand property

Spuds 12 anni fa
parent
commit
5cf9994489

+ 10 - 7
Themes/default/PersonalMessage.template.php

@@ -1068,21 +1068,24 @@ function template_send()
 
 	// Send, Preview, spellcheck buttons.
 	echo '
-				<p><label for="outbox"><input type="checkbox" name="outbox" id="outbox" value="1" tabindex="', $context['tabindex']++, '"', $context['copy_to_outbox'] ? ' checked="checked"' : '', ' class="input_check" /> ', $txt['pm_save_outbox'], '</label></p>
-				<p id="shortcuts" class="smalltext">
-					', isBrowser('is_firefox') ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '
+				<p>
+					<label for="outbox"><input type="checkbox" name="outbox" id="outbox" value="1" tabindex="', $context['tabindex']++, '"', $context['copy_to_outbox'] ? ' checked="checked"' : '', ' class="input_check" /> ', $txt['pm_save_outbox'], '</label>
 				</p>
-				<p id="post_confirm_strip" class="righttext">
+				<hr class="hrcolor" />
+				<span id="shortcuts" class="smalltext">
+					', isBrowser('is_firefox') ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '
+				</span>
+				<span id="post_confirm_strip" class="righttext">
 					', template_control_richedit_buttons($context['post_box_name']), '
-				</p>
+				</span>
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
 				<input type="hidden" name="replied_to" value="', !empty($context['quoted_message']['id']) ? $context['quoted_message']['id'] : 0, '" />
 				<input type="hidden" name="pm_head" value="', !empty($context['quoted_message']['pm_head']) ? $context['quoted_message']['pm_head'] : 0, '" />
 				<input type="hidden" name="f" value="', isset($context['folder']) ? $context['folder'] : '', '" />
 				<input type="hidden" name="l" value="', isset($context['current_label_id']) ? $context['current_label_id'] : -1, '" />
-				<br class="clear" />
-				</div>
+				<br class="clear_right" />
+			</div>
 			<span class="lowerframe"><span></span></span>
 		</div>
 	</form>';

+ 6 - 6
Themes/default/Post.template.php

@@ -506,11 +506,11 @@ function template_main()
 
 	// Finally, the submit buttons.
 	echo '
-					<p class="smalltext" id="shortcuts">
-						', isBrowser('is_firefox') ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '
-					</p>
 					<hr class="hrcolor" />
-					<p id="post_confirm_buttons">
+					<span class="smalltext" >
+						', isBrowser('is_firefox') ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '
+					</span>
+					<span id="post_confirm_buttons">
 						', template_control_richedit_buttons($context['post_box_name']);
 
 	// Option to delete an event if user is editing one.
@@ -519,8 +519,8 @@ function template_main()
 						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" onclick="return confirm(\'', $txt['event_delete_confirm'], '\');" class="button_submit" />';
 
 	echo '
-						<br class="clear_right" />
-					</p>
+					</span>
+					<br class="clear_right" />
 				</div>
 				<span class="lowerframe"><span></span></span>
 			</div>

+ 3 - 4
Themes/default/css/index.css

@@ -2305,7 +2305,6 @@ ul.post_options li
 	overflow: hidden;
 	margin: .5em 0;
 	padding: 0;
-	border-bottom: 1px solid #cacdd3;
 	padding: 0.5em;
 }
 #postAttachment dd, #postAttachment2 dd
@@ -2820,15 +2819,15 @@ tr.windowbg td, tr.windowbg2 td, tr.approvebg td, tr.highlight2 td
 }
 .topic_table td.stickybg2
 {
-	background: url(../images/icons/quick_sticky.png) no-repeat 98% 4px;
+	background:  #f2e3d9 url(../images/icons/quick_sticky.png) no-repeat 98% 4px;
 }
 .topic_table td.lockedbg2
 {
-	background: url(../images/icons/quick_lock.png) no-repeat 98% 4px;
+	background: #d8e1e7 url(../images/icons/quick_lock.png) no-repeat 98% 4px;
 }
 .topic_table td.locked_sticky2
 {
-	background: url(../images/icons/quick_sticky_lock.png) no-repeat 98% 4px;
+	background: #f2e3d9 url(../images/icons/quick_sticky_lock.png) no-repeat 98% 4px;
 }
 .topic_table td.lastpost
 {