From a862e9996b66249ba36ad57b02da98220c38ab34 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 17 Jun 2014 02:31:23 -0400
Subject: [PATCH] Fix redundant horizontal scrollbar in HTML editor (#1489950)
---
CHANGELOG | 1 +
skins/classic/editor_content.css | 1 -
program/js/editor.js | 2 +-
skins/larry/editor_content.css | 1 -
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 62b6e7a..1b51f8a 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 df3d412..92654e3 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -23,7 +23,7 @@
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 aabed07..e518b95 100644
--- a/skins/classic/editor_content.css
+++ b/skins/classic/editor_content.css
@@ -27,5 +27,4 @@
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 aabed07..e518b95 100644
--- a/skins/larry/editor_content.css
+++ b/skins/larry/editor_content.css
@@ -27,5 +27,4 @@
padding-left: 5px;
border-left: #1010ff 2px solid;
margin-left: 5px;
- width: 100%;
}
--
Gitblit v1.9.1