1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00

Merge branch '3.1.x' into 3.2.x

* 3.1.x:
  [ticket/14844] Add CSS classes for strong and italics text to BBCodes
This commit is contained in:
Tristan Darricau 2017-03-19 18:00:35 +01:00
commit 67509edd40
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881
2 changed files with 10 additions and 2 deletions

View File

@ -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 -->

View File

@ -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;
}