diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /extensions/WikiEditor/modules/jquery.wikiEditor.html | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'extensions/WikiEditor/modules/jquery.wikiEditor.html')
| -rw-r--r-- | extensions/WikiEditor/modules/jquery.wikiEditor.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.html b/extensions/WikiEditor/modules/jquery.wikiEditor.html index 7a890af0..349f0273 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.html +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.html @@ -6,14 +6,14 @@ <!--[if gte IE 8]> <style> /* IE8 ONLY - This is how we are fixing the double-height of BR tags when they are alone in a P tag */ - p > br { + p > br { display: none; } - p > br + br { + p > br + br { display: block; } </style> - <![endif]--> + <![endif]--> <style> body { margin: 0; |