Follow-up to bug #14360: htmlArea RTE: Toolbar and context menu styling needs adjustments

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7927 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 96b9aac..442a75b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-06-14  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #14723: htmlArea RTE: JS errors block RTE usage in IE6 and IE7 (Thanks to Jo Hasenau)
+       * Follow-up to bug #14360: htmlArea RTE: Toolbar and context menu styling needs adjustments
 
 2010-06-14  Peter Niederlag  <netservice@niekom.de>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 4e73e78..f70215f 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2010-06-14  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #14723: htmlArea RTE: JS errors block RTE usage in IE6 and IE7 (Thanks to Jo Hasenau)
+       * Follow-up to bug #14360: htmlArea RTE: Toolbar and context menu styling needs adjustments
 
 2010-06-10  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
index 0a4987d..78aabea 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
@@ -3454,7 +3454,7 @@ HTMLArea.util.Tips = function () {
                                if (label && this.helpIcon && !Ext.isIE) {
                                        var helpImage = label.insertFirst({
                                                tag: 'img',
-                                               src: HTMLArea.editorSkin + 'images/helpbubble.gif',
+                                               src: HTMLArea.editorSkin + 'images/system-help-open.png',
                                                style: 'vertical-align: middle; padding-right: 2px;'
                                        });
                                        if (this.helpDisplay == 'image' || this.helpDisplay == 'both'){

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css
index 48285dc..9f708c6 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css
+++ b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css
@@ -14,7 +14,9 @@
        color: #7F8083;
 }
 .editorWrap {
-       margin:0;padding:0;
+       margin: 0;
+       margin-top: 2px;
+       padding: 0;
 }
 .editorWrap textarea {
        border: 1px solid #A2AAB8;
@@ -131,8 +133,10 @@
 }
 .htmlarea .toolbar .separator {
        border:1px solid #999;
-       width:7px;height:23px;
-       float:left;
+       width: 7px;
+       height: 23px;
+       margin-bottom: 1px;
+       float: left;
 }
 .htmlarea .toolbar .space {
        height:22px;
@@ -141,11 +145,15 @@
        float:left;
 }
 .htmlarea .toolbar .select {
-       font:10px Tahoma,Verdana,sans-serif;
-       height:18px;
-       border:1px solid #A2AAB8;
+       color: WindowText;
+       height: 18px;
        margin: 0 0 4px 0;
-       padding: 1px;
+}
+.htmlarea .toolbar .x-form-item label.x-form-item-label{
+       padding-right: 0;
+}
+.htmlarea .toolbar .x-form-field-wrap .x-form-trigger {
+       right: 0;
 }
 .htmlarea .toolbar .select, .htmlarea .toolbar .select:hover, .htmlarea .toolbar .select:active {
        background-color:#fff;color:ButtonText;

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/helpbubble.gif b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/helpbubble.gif
deleted file mode 100644 (file)
index 44c7187..0000000
Binary files a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/helpbubble.gif and /dev/null differ

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/system-help-open.png b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/system-help-open.png
new file mode 100644 (file)
index 0000000..7a6d5bc
Binary files /dev/null and b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/system-help-open.png differ

diff --git a/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css b/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css
index 2a43695..ffb99d4 100644 (file)
--- a/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css
+++ b/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css
@@ -14,7 +14,9 @@
        color: #7F8083;
 }
 .editorWrap {
-       margin:0;padding:0;
+       margin: 0;
+       margin-top: 2px;
+       padding: 0;
 }
 .editorWrap textarea {
        border: 1px solid #A2AAB8;
@@ -137,6 +139,7 @@
        width: 7px;
        height: 23px;
        border: 1px solid #EFEFF4;
+       margin-bottom: 1px;
        float: left;
 }
 .htmlarea .toolbar .space {
@@ -147,13 +150,15 @@
        float:left;
 }
 .htmlarea .toolbar .select {
-       color:WindowText;
-       font-size:10px;
-       font-family: Verdana, Helvetica, Geneva, Arial, sans-serif;
-       height:18px;
-       border:1px solid #A2AAB8;
+       color: WindowText;
+       height: 18px;
        margin: 0 0 4px 0;
-       padding: 1px;
+}
+.htmlarea .toolbar .x-form-item label.x-form-item-label{
+       padding-right: 0;
+}
+.htmlarea .toolbar .x-form-field-wrap .x-form-trigger {
+       right: 0;
 }
 .htmlarea .toolbar .select, .htmlarea .toolbar .select:hover, .htmlarea .toolbar .select:active {
        background-color:Window;

diff --git a/typo3/sysext/t3skin/rtehtmlarea/images/helpbubble.gif b/typo3/sysext/t3skin/rtehtmlarea/images/helpbubble.gif
deleted file mode 100644 (file)
index 44c7187..0000000
Binary files a/typo3/sysext/t3skin/rtehtmlarea/images/helpbubble.gif and /dev/null differ

diff --git a/typo3/sysext/t3skin/rtehtmlarea/images/system-help-open.png b/typo3/sysext/t3skin/rtehtmlarea/images/system-help-open.png
new file mode 100644 (file)
index 0000000..7a6d5bc
Binary files /dev/null and b/typo3/sysext/t3skin/rtehtmlarea/images/system-help-open.png differ