aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2017-03-19 18:00:35 +0100
committerTristan Darricau <github@nicofuma.fr>2017-03-19 18:00:35 +0100
commit67509edd4070b6a8158e1572241a96bc28c8d3c9 (patch)
tree22c27fe4a458f093538246536497884f5fee3d92
parente497937dd437796148556241f045ac9480b4a675 (diff)
parentd114a3d4152f646564a90a436a9545a62a452262 (diff)
downloadforums-67509edd4070b6a8158e1572241a96bc28c8d3c9.tar
forums-67509edd4070b6a8158e1572241a96bc28c8d3c9.tar.gz
forums-67509edd4070b6a8158e1572241a96bc28c8d3c9.tar.bz2
forums-67509edd4070b6a8158e1572241a96bc28c8d3c9.tar.xz
forums-67509edd4070b6a8158e1572241a96bc28c8d3c9.zip
Merge branch '3.1.x' into 3.2.x
* 3.1.x: [ticket/14844] Add CSS classes for strong and italics text to BBCodes
-rw-r--r--phpBB/styles/prosilver/template/bbcode.html4
-rw-r--r--phpBB/styles/prosilver/theme/common.css8
2 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html
index 8c4e941092..940c0ace29 100644
--- a/phpBB/styles/prosilver/template/bbcode.html
+++ b/phpBB/styles/prosilver/template/bbcode.html
@@ -53,13 +53,13 @@
<!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open -->
<!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close -->
-<!-- BEGIN b_open --><strong><!-- END b_open -->
+<!-- BEGIN b_open --><strong class="text-strong"><!-- END b_open -->
<!-- BEGIN b_close --></strong><!-- END b_close -->
<!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
<!-- BEGIN u_close --></span><!-- END u_close -->
-<!-- BEGIN i_open --><em><!-- END i_open -->
+<!-- BEGIN i_open --><em class="text-italics"><!-- END i_open -->
<!-- BEGIN i_close --></em><!-- END i_close -->
<!-- BEGIN color --><span style="color: {COLOR}">{TEXT}</span><!-- END color -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index aa15fe2b45..ed2cc369b1 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -97,10 +97,18 @@ b, strong {
font-weight: bold;
}
+.text-strong {
+ font-weight: bold;
+}
+
i, em {
font-style: italic;
}
+.text-italics {
+ font-style: italic;
+}
+
u {
text-decoration: underline;
}