Changeset 6554 for CKEditor/trunk

Timestamp:

03/16/11 14:53:05 (2 years ago)

Author:

Saare

Message:

#7018: [IE] Combo boxes have no border in office2003/v2 since [5911].

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/richcombo/plugin.js (modified) (1 diff)
• _source/skins/kama/richcombo.css (modified) (1 diff)
• _source/skins/office2003/richcombo.css (modified) (2 diffs)
• _source/skins/v2/richcombo.css (modified) (3 diffs)

CKEditor/trunk/CHANGES.html

@@ -70 +70 @@
                 <li><a href="http://dev.ckeditor.com/ticket/7330">#7330</a> : New list items now do not inherit the <code>value</code> attribute from their sibiling.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/7293">#7293</a> : The "automatic" color button is now presented correctly without focus inside the editor.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/7018">#7018</a> : [IE] Combo boxes didn't have border around them.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/7124">#7124</a> : Czech;</li>

CKEditor/trunk/_source/plugins/richcombo/plugin.js

@@ -198 +198 @@
                                                         '<span id="' + id + '_text" class="cke_text cke_inline_label">' + this.label + '</span>' +
                                                 '</span>' +
-                                                '<span class=cke_openbutton>' + ( CKEDITOR.env.hc ? '<span>&#9660;</span>' : CKEDITOR.env.air ?  '&nbsp;' : '' ) + '</span>' +  // BLACK DOWN-POINTING TRIANGLE
+                                                '<span class=cke_openbutton><span class=cke_icon>' + ( CKEDITOR.env.hc ? '&#9660;' : CKEDITOR.env.air ?  '&nbsp;' : '' ) + '</span></span>' +   // BLACK DOWN-POINTING TRIANGLE
                                         '</a>' +
                                 '</span>' +

CKEditor/trunk/_source/skins/kama/richcombo.css

@@ -124 +124 @@
 .cke_skin_kama .cke_rcombo .cke_openbutton
 {
+        display: inline-block;
+}
+
+.cke_skin_kama .cke_rcombo .cke_openbutton .cke_icon
+{
+        display: inline-block;
         background-image: url(images/sprites.png);
         _background-image: url(images/sprites_ie6.png);
         background-position: 0 -68px;
         background-repeat: no-repeat;
-        display: inline-block;
         width: 17px;
         height: 19px;
         margin: 1px 2px;
-        background-repeat: no-repeat;
-}
-
-.cke_skin_kama .cke_rcombo .cke_openbutton span
-{
-        display: none;
-}
-
-.cke_skin_kama .cke_hc .cke_rcombo .cke_openbutton span
-{
-        display : inline;
+}
+
+.cke_skin_kama .cke_hc .cke_rcombo .cke_openbutton .cke_icon
+{
+        background: none;
 }
 

CKEditor/trunk/_source/skins/office2003/richcombo.css

@@ -142 +142 @@
 {
         display: inline-block;
-
+        border-top: 1px solid #8f8f73;
+        border-bottom: 1px solid #8f8f73;
+}
+
+.cke_skin_office2003 .cke_rcombo .cke_openbutton .cke_icon
+{
+        display: inline-block;
         background-position: 5px -1002px;
         background-image: url(images/sprites.png);
         _background-image: url(images/sprites_ie6.png);
         background-repeat: no-repeat;
-
-        border-top: 1px solid #8f8f73;
-        border-bottom: 1px solid #8f8f73;
         width: 14px;
         height: 22px;
@@ -155 +158 @@
 
 /* IE with zoom != 100% will distort the icons otherwise #4821 */
-.cke_skin_office2003 .cke_browser_ie .cke_rcombo .cke_openbutton
+.cke_skin_office2003 .cke_browser_ie .cke_rcombo .cke_openbutton .cke_icon
 {
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
-.cke_skin_office2003 .cke_browser_ie6 .cke_rcombo .cke_openbutton
+.cke_skin_office2003 .cke_browser_ie6 .cke_rcombo .cke_openbutton .cke_icon
 {
         filter: ;
 }
-
-.cke_skin_office2003 .cke_rcombo .cke_openbutton span
-{
-        display: none;
-}
-
-.cke_skin_office2003 .cke_hc .cke_rcombo .cke_openbutton span
-{
-        display : inline;
+.cke_skin_office2003 .cke_hc .cke_rcombo .cke_openbutton .cke_icon
+{
+        background: none;
+        filter: ;
 }
 

CKEditor/trunk/_source/skins/v2/richcombo.css

@@ -137 +137 @@
 {
         display: inline-block;
-
+        border-top: 1px solid #8f8f73;
+        border-bottom: 1px solid #8f8f73;
+}
+
+.cke_skin_v2 .cke_rcombo .cke_openbutton .cke_icon
+{
+        display: inline-block;
         background-position: 5px -715px;
         background-image: url(images/sprites.png);
@@ -143 +149 @@
         background-repeat: no-repeat;
 
-        border-top: 1px solid #8f8f73;
-        border-bottom: 1px solid #8f8f73;
         width: 14px;
         height: 20px;
@@ -150 +154 @@
 
 /* IE with zoom != 100% will distort the icons otherwise #4821 */
-.cke_skin_v2 .cke_browser_ie .cke_rcombo .cke_openbutton
+.cke_skin_v2 .cke_browser_ie .cke_rcombo .cke_openbutton .cke_icon
 {
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
-.cke_skin_v2 .cke_browser_ie6 .cke_rcombo .cke_openbutton
+.cke_skin_v2 .cke_browser_ie6 .cke_rcombo .cke_openbutton .cke_icon
 {
         filter: ;
 }
-
-.cke_skin_v2 .cke_rcombo .cke_openbutton span
-{
-        display: none;
-}
-
-.cke_skin_v2 .cke_hc .cke_rcombo .cke_openbutton span
-{
-        display : inline;
+.cke_skin_v2 .cke_hc .cke_rcombo .cke_openbutton .cke_icon
+{
+        background: none;
+        filter: ;
 }