Merge pull request #25 from VSEphpbb/fixes

Use div tags instead of P, for BBcode compatibility
phpbb-extensions · Jul 13, 2014 · 0c1f49f · 0c1f49f
2 parents afbd275 + 8a9df94
commit 0c1f49f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/adm/style/board_announcements.html b/adm/style/board_announcements.html
@@ -40,7 +40,7 @@ <h3>{L_WARNING}</h3>
 	<!-- IF BOARD_ANNOUNCEMENTS_PREVIEW -->
 		<fieldset>
 			<legend>{L_BOARD_ANNOUNCEMENTS_PREVIEW}</legend>
-			<p style="padding:10px; font-size:1.0em; <!-- IF BOARD_ANNOUNCEMENTS_BGCOLOR -->background-color:#{BOARD_ANNOUNCEMENTS_BGCOLOR}<!-- ENDIF -->">{BOARD_ANNOUNCEMENTS_PREVIEW}</p>
+			<div style="padding:10px; font-size:1.0em; overflow: auto; <!-- IF BOARD_ANNOUNCEMENTS_BGCOLOR -->background-color:#{BOARD_ANNOUNCEMENTS_BGCOLOR}<!-- ENDIF -->">{BOARD_ANNOUNCEMENTS_PREVIEW}</div>
 		</fieldset>
 	<!-- ENDIF -->
 

diff --git a/styles/all/template/event/overall_header_content_before.html b/styles/all/template/event/overall_header_content_before.html
@@ -3,7 +3,7 @@
 	<div id="phpbb_announcement"<!-- IF BOARD_ANNOUNCEMENT_BGCOLOR --> style="background-color:#{BOARD_ANNOUNCEMENT_BGCOLOR}"<!-- ENDIF -->>
 		<div class="inner">
 			<a href="{U_BOARD_ANNOUNCEMENT_CLOSE}" data-ajax="close_announcement" data-overlay="false" class="close" title="{L_BOARD_ANNOUNCEMENT_CLOSE}"></a>
-			<p>{BOARD_ANNOUNCEMENT}</p>
+			<div>{BOARD_ANNOUNCEMENT}</div>
 		</div>
 	</div>
 <!-- ENDIF -->
diff --git a/styles/all/theme/boardannouncements.css b/styles/all/theme/boardannouncements.css
@@ -13,10 +13,11 @@
 }
 
 /* zero out any text margins and scroll any overflow */
-#phpbb_announcement .inner p {
+#phpbb_announcement .inner div {
 	margin: 0;
 	overflow-x: auto;
 	overflow: hidden;
+	font-size: 1.1em;
 	line-height: 1.5em;
 }