diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-17 09:27:17 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-17 09:27:17 +0200 |
| commit | efc470f0ac7587707665e92701e3937c9b6cc78d (patch) | |
| tree | 6674f2f57526f086e02755142f46901db74469c5 /skins/classic/editor_content.css | |
| parent | f1aaca6807742f7a890db152395d5c293b6e4e66 (diff) | |
| parent | c0a5aa5f5ff38ac7b8a650b07c134b7b86deb27f (diff) | |
Merge branch 'dev-text2html'
Conflicts:
program/js/app.js
Fix handling magic_quotes in rcube_text2html and rcube_html2text - move
stripslashes from these classes to action files
Diffstat (limited to 'skins/classic/editor_content.css')
| -rw-r--r-- | skins/classic/editor_content.css | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/skins/classic/editor_content.css b/skins/classic/editor_content.css index aabed07b5..67480ab77 100644 --- a/skins/classic/editor_content.css +++ b/skins/classic/editor_content.css @@ -12,20 +12,15 @@ body { margin-top: 2px; } -pre -{ +div.pre { margin: 0; padding: 0; - white-space: -moz-pre-wrap !important; - white-space: pre-wrap !important; - white-space: pre; - word-wrap: break-word; /* IE (and Safari) */ + font-family: monospace; } blockquote { - padding-left: 5px; border-left: #1010ff 2px solid; - margin-left: 5px; - width: 100%; + margin: 0; + padding: 0 0.4em; } |