summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-06-17 08:31:23 +0200
committerAleksander Machniak <alec@alec.pl>2014-06-17 08:31:23 +0200
commita862e9996b66249ba36ad57b02da98220c38ab34 (patch)
tree29830fa787a901f7958778fc2498528eea69de07
parent702ce09f892f8d9de45e69b3ef042ebea749576a (diff)
Fix redundant horizontal scrollbar in HTML editor (#1489950)
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/editor.js2
-rw-r--r--skins/classic/editor_content.css1
-rw-r--r--skins/larry/editor_content.css1
4 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 62b6e7a99..1b51f8ad5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix redundant horizontal scrollbar in HTML editor (#1489950)
- Fix PHP error in Preferences when default_folders was in dont_override (#1489940)
- Add configurable LDAP_OPT_DEREF option (#1489864)
- Fix unintentional draft autosave request if autosave is disabled (#1489882)
diff --git a/program/js/editor.js b/program/js/editor.js
index df3d41240..92654e330 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -23,7 +23,7 @@ function rcmail_editor_init(config)
apply_source_formatting: true,
theme: 'advanced',
language: config.lang,
- content_css: config.skin_path + '/editor_content.css',
+ content_css: config.skin_path + '/editor_content.css?v2',
theme_advanced_toolbar_location: 'top',
theme_advanced_toolbar_align: 'left',
theme_advanced_buttons3: '',
diff --git a/skins/classic/editor_content.css b/skins/classic/editor_content.css
index aabed07b5..e518b9511 100644
--- a/skins/classic/editor_content.css
+++ b/skins/classic/editor_content.css
@@ -27,5 +27,4 @@ blockquote
padding-left: 5px;
border-left: #1010ff 2px solid;
margin-left: 5px;
- width: 100%;
}
diff --git a/skins/larry/editor_content.css b/skins/larry/editor_content.css
index aabed07b5..e518b9511 100644
--- a/skins/larry/editor_content.css
+++ b/skins/larry/editor_content.css
@@ -27,5 +27,4 @@ blockquote
padding-left: 5px;
border-left: #1010ff 2px solid;
margin-left: 5px;
- width: 100%;
}