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 | |
| 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')
| -rw-r--r-- | skins/classic/editor_content.css | 13 | ||||
| -rw-r--r-- | skins/classic/mail.css | 11 |
2 files changed, 8 insertions, 16 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; } diff --git a/skins/classic/mail.css b/skins/classic/mail.css index fc066e023..6409b6b9b 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -1306,17 +1306,12 @@ div.message-htmlpart a color: #0000CC; } -div.message-part pre, -div.message-htmlpart pre, div.message-part div.pre { margin: 0px; padding: 0px; font-family: monospace; font-size: 12px; - white-space: -moz-pre-wrap !important; - white-space: pre-wrap !important; - white-space: pre; } div.message-part span.sig @@ -1330,8 +1325,10 @@ div.message-part blockquote border-left: 2px solid blue; border-right: 2px solid blue; background-color: #F6F6F6; - margin: 2px 0px; - padding: 1px 8px 1px 10px; + margin: 2px 0; + padding: 0 0.4em; + overflow: hidden; + text-overflow: ellipsis; } div.message-part blockquote blockquote |