diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-07-26 14:53:59 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-07-26 14:53:59 +0300 |
| commit | 6455d8a5f809c98d93f6bfe89fbe55a64c66a03f (patch) | |
| tree | 1f431716f3d581d33983fd2b788eb91d42a8ac95 /WebContent/VAADIN/themes | |
| parent | df430157bf12ae88e265318c09250a3865981a0c (diff) | |
| parent | ca9fab0922d9db510c51f2d363b46577f7f6c0c4 (diff) | |
| download | vaadin-framework-6455d8a5f809c98d93f6bfe89fbe55a64c66a03f.tar.gz vaadin-framework-6455d8a5f809c98d93f6bfe89fbe55a64c66a03f.zip | |
Merge remote branch 'origin/6.8'
Conflicts:
src/com/vaadin/terminal/gwt/server/CommunicationManager.java
Diffstat (limited to 'WebContent/VAADIN/themes')
| -rw-r--r-- | WebContent/VAADIN/themes/base/textfield/richtext.css | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/richtext.css index a304fa2a57..6a236886cc 100644 --- a/WebContent/VAADIN/themes/base/textfield/richtext.css +++ b/WebContent/VAADIN/themes/base/textfield/richtext.css @@ -6,7 +6,9 @@ background: #fff; border: none; } - +.v-richtextarea .gwt-HTML { + height: 100%; +} .v-richtextarea .gwt-RichTextToolbar { white-space: nowrap; background: #959595 url(img/richtext-toolbar-bg.png) repeat-x 0 -42px; |