fix #7281 - fix column resizing for merged cells

[roojs1] / css / button.css

diff --git a/css/button.css b/css/button.css
index af61410..d944cb8 100644 (file)
--- a/css/button.css
+++ b/css/button.css
@@ -4,7 +4,7 @@
 
 .x-btn
 {
-       font:normal 8pt tahoma,arial,verdana,helvetica;
+       font: normal 8pt tahoma,verdan,arial,helvetica;
        white-space: nowrap;
     text-decoration:none !important;
     color:black !important;
@@ -29,10 +29,10 @@
 
 .x-btn-left, 
 .x-btn-right
-{\r
-       font-size:1px;\r
+{
+       font-size:1px;
        line-height:1px;
-    width: 3px;\r
+    width: 3px;
 }
 
 
@@ -40,7 +40,7 @@
 .x-btn-right i 
 {
     display: block;
-    overflow: hidden
+    overflow: hidden;
     width: 3px;
     line-height: 1px;
     font-size: 1px;
@@ -51,7 +51,7 @@
     
 }
 
-/* -------- BUTTON BACKGROUND IMAGE -------------- */\r
+/* -------- BUTTON BACKGROUND IMAGE -------------- */
 .x-btn-left,
 .x-btn-center,
 .x-btn-right
@@ -61,15 +61,16 @@
     background-repeat: no-repeat;
     /* might have height, and padding / margin zero'd */
     height:21px;
+    vertical-align: middle;
+    
     
-    \r
 }
 .x-btn-left
 {
     background-position:0 0;
 }
 .x-btn-right
-{\r
+{
        background-position:0 -21px;
 }
 .x-btn-center
@@ -120,8 +121,8 @@
        background-position:0 -126px;
 }
 
-/* -------------------------- BUTTON FOCUS -------------------------- */\r
-/* ??? any special settings ?? */\r
+/* -------------------------- BUTTON FOCUS -------------------------- */
+/* ??? any special settings ?? */
  
 /* -------------------------- BUTTON DISABLED -------------------------- */ 
 .x-btn .x-btn-disabled
@@ -155,16 +156,18 @@
 {
     padding-left: 0px;
     padding-right: 0px;
-}\r
+}
 /* -------------------------- BUTTON WITH ICONS  -------------------------- */ 
 .x-btn-text-icon .x-btn-center .x-btn-text
 {
    background-position:0 2px; 
    background:none no-repeat scroll 0 0 transparent;
     /* padding : 3px 0 2px 18px; */
-    padding : 0 0 2px 18px; 
+    padding: 1px 0px 1px 18px;
 
 }
+
+
 /* -------------------------- BUTTON WITH MENUS  -------------------------- */ 
 button.x-btn-menu-arrow-el
 {
@@ -191,5 +194,5 @@ button.x-btn-menu-arrow-el
     /* padding : 3px 0 2px 18px; */
     padding : 0 0 2px 0px; 
 }
-\r
+
   
\ No newline at end of file