X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/7a654f8d43fdb43d78b63d90528bed6e86b608cc..refs/heads/master:/resources/themes/stylesheets/ext4/default/widgets/_grid.scss

diff --git a/resources/themes/stylesheets/ext4/default/widgets/_grid.scss b/resources/themes/stylesheets/ext4/default/widgets/_grid.scss
index 9acf0bf7..bd4092a4 100644
--- a/resources/themes/stylesheets/ext4/default/widgets/_grid.scss
+++ b/resources/themes/stylesheets/ext4/default/widgets/_grid.scss
@@ -9,8 +9,9 @@
             border-top-color: $grid-header-background-color;
         }
 
+        // Still needs left and right border even if it's not visible so that its available width can be calculated correctly
         .#{$prefix}grid-header-ct-hidden {
-            border-width: 0 0 0 0 !important;
+            border-top-width: 0 !important;
         }
     }
 
@@ -29,17 +30,15 @@
         border-collapse: separate;
     }
 
+    .#{$prefix}grid-row .#{$prefix}grid-table {
+        border-collapse: collapse;
+    }
+
     .#{$prefix}grid-locked .#{$prefix}grid-inner-locked {
         border-width: 0 1px 0 0 !important;
         border-style: solid;
     }
 
-    @if $include-ie or $compile-all {
-        .#{$prefix}ie .#{$prefix}grid-table {
-            border-collapse: collapse;
-        }
-    }
-
     .#{$prefix}grid-header-ct {
         cursor: default;
         zoom: 1;
@@ -50,7 +49,11 @@
             @include background-gradient($grid-header-background-color, $grid-header-background-gradient);
         }
     }
-    
+
+    .#{$prefix}accordion-item .#{$prefix}grid-header-ct {
+        border: 0 none;
+    }
+
     @if $include-ie or $compile-all {
         .#{$prefix}border-box .#{$prefix}ie9 {
             .#{$prefix}grid-header-ct {
@@ -125,13 +128,15 @@
         .#{$prefix}nlg {
             .#{$prefix}grid-header-ct,
             .#{$prefix}column-header {
-                background: theme-image($theme-name, 'grid/column-header-bg.gif') repeat-x 0 top;
+                background: repeat-x 0 top;
+                background-image: theme-background-image($theme-name, 'grid/column-header-bg.gif');
             }
 
             .#{$prefix}column-header-over,
             .#{$prefix}column-header-sort-ASC,
             .#{$prefix}column-header-sort-DESC {
-                background: #ebf3fd theme-image($theme-name, 'grid/column-header-over-bg.gif') repeat-x 0 top;
+                background: #ebf3fd repeat-x 0 top;
+                background-image: theme-background-image($theme-name, 'grid/column-header-over-bg.gif');
             }
         }
     }
@@ -142,7 +147,7 @@
         width: $grid-header-trigger-width;
         background: no-repeat left center;
         background-color: #c3daf9;
-        background-image: theme-image($theme-name, 'grid/grid3-hd-btn.gif');
+        background-image: theme-background-image($theme-name, 'grid/grid3-hd-btn.gif');
         position: absolute;
         right: 0;
         top: 0;
@@ -161,6 +166,7 @@
 
         .#{$prefix}column-header-text {
             padding-right: 0.5ex;
+            margin-right: 6px;
         }
     }
     .#{$prefix}column-header-align-center {
@@ -173,11 +179,13 @@
     // Sort direction indicator is a background of the text span.
     .#{$prefix}column-header-sort-ASC .#{$prefix}column-header-text {
         padding-right: 16px;
-        background: theme-image($theme-name, 'grid/sort_asc.gif') no-repeat right 6px;
+        background: no-repeat right 6px;
+        background-image: theme-background-image($theme-name, 'grid/sort_asc.gif');
     }
     .#{$prefix}column-header-sort-DESC .#{$prefix}column-header-text {
         padding-right: 16px;
-        background: theme-image($theme-name, 'grid/sort_desc.gif') no-repeat right 6px;
+        background: no-repeat right 6px;
+        background-image: theme-background-image($theme-name, 'grid/sort_desc.gif');
     }
 
     //grid rows
@@ -188,16 +196,14 @@
 
         padding: $grid-row-padding;
 
-        -moz-user-select: none;
-        -khtml-user-select: none;
-        -webkit-user-select: ignore;
+        @include no-select;
 
         .#{$prefix}grid-cell {
             @if $grid-row-cell-color {
                 color: $grid-row-cell-color;
             }
             font: $grid-row-cell-font;
-
+            background-color: $grid-row-cell-background;
             border-color: $grid-row-cell-border-color;
             border-style: $grid-row-cell-border-style;
             border-width: $grid-row-cell-border-width;
@@ -241,35 +247,6 @@
         background-color: $grid-row-cell-selected-background-color !important;
     }
 
-    @if $include-ie {
-        .#{$prefix}ie {
-            .#{$prefix}grid-cell {
-                border-width: 0;
-            }
-
-            .#{$prefix}grid-cell-inner {
-                border-color: $grid-row-cell-border-color;
-                border-style: $grid-row-cell-border-style;
-                border-width: $grid-row-cell-border-width;
-                border-top-color: lighten($grid-row-cell-border-color, 5);
-                height: 100%;
-            }
-
-            .#{$prefix}grid-row-over .#{$prefix}grid-cell-inner {
-                border-color: $grid-row-cell-over-border-color;
-            }
-
-            .#{$prefix}grid-row-focused .#{$prefix}grid-cell-inner {
-                border-color: $grid-row-cell-focus-border-color;
-            }
-
-            .#{$prefix}grid-row-selected .#{$prefix}grid-cell-inner {
-                border-style: $grid-row-cell-selected-border-style;
-                border-color: $grid-row-cell-selected-border-color;
-            }
-        }
-    }
-
     .#{$prefix}grid-rowwrap-div {
         .#{$prefix}grid-cell,
         .#{$prefix}grid-cell-inner {
@@ -299,9 +276,7 @@
 
         font: $grid-cell-font;
 
-        -moz-user-select: none;
-        -khtml-user-select:none;
-        -webkit-user-select:ignore;
+        @include no-select;
     }
 
     .#{$prefix}grid-cell-inner {
@@ -337,22 +312,19 @@
         @include background-gradient(#f6f6f6, 'grid-cell-special');
     }
 
+    /*
+    IE6-8 have issues with shrinking the TR to 0px (even w/line-height=0), so we
+    use an IE-specific trick to make the row disappear. We cannot do this on any
+    other browser, because it is not a non-standard thing to do and those other
+    browsers will do whacky things with it.
+    */
+
     .#{$prefix}ie6,
     .#{$prefix}ie7,
     .#{$prefix}quirks .#{$prefix}ie8,
     .#{$prefix}strict .#{$prefix}ie8 {
-        .#{$prefix}grid-row .#{$prefix}grid-cell-special .#{$prefix}grid-cell-inner {
-            padding-bottom: 2px;
-        }
-    }
-    
-    
-    .#{$prefix}strict {
-        .#{$prefix}ie6, .#{$prefix}ie7 {
-            .#{$prefix}grid-cell-inner {
-                padding-top: 2px;
-                padding-bottom: 0;
-            }
+        .#{$prefix}grid-header-row {
+            position: absolute;
         }
     }
 
@@ -363,7 +335,7 @@
     }
 
     .#{$prefix}grid-dirty-cell {
-        background-image: theme-image($theme-name, 'grid/dirty.gif');
+        background-image: theme-background-image($theme-name, 'grid/dirty.gif');
         background-position: 0 0;
         background-repeat: no-repeat;
     }
@@ -381,18 +353,18 @@
 
             .#{$prefix}grid-row .#{$prefix}grid-cell-special,
             .#{$prefix}grid-row-over .#{$prefix}grid-cell-special {
-                background-image: theme-image($theme-name, 'grid/cell-special-bg.gif');
+                background-image: theme-background-image($theme-name, 'grid/cell-special-bg.gif');
 
             }
 
             .#{$prefix}grid-row-focused .#{$prefix}grid-cell-special,
             .#{$prefix}grid-row-selected .#{$prefix}grid-cell-special {
-                background-image: theme-image($theme-name, 'grid/cell-special-selected-bg.gif');
+                background-image: theme-background-image($theme-name, 'grid/cell-special-selected-bg.gif');
             }
         }
     }
 
-    //this is panel as gridpanel doesnt use a baseCls..........
+    //this is panel as gridpanel doesn't use a baseCls
     .#{$prefix}panel-with-col-lines .#{$prefix}grid-row .#{$prefix}grid-cell {
         padding-right: 0;
         border-right: 1px solid $grid-cell-with-col-lines-border-color;
@@ -414,7 +386,7 @@
         .#{$prefix}grid-row .#{$prefix}grid-property-name .#{$prefix}grid-cell-inner,
         .#{$prefix}grid-row-over .#{$prefix}grid-property-name .#{$prefix}grid-cell-inner {
             padding-left: 12px;
-            background: theme-image($theme-name, 'grid/property-cell-bg.gif');
+            background-image: theme-background-image($theme-name, 'grid/property-cell-bg.gif');
             background-repeat: no-repeat;
             background-position: -16px 1px;
         }
@@ -427,9 +399,7 @@
     }
 
     .#{$prefix}unselectable {
-        -moz-user-select: none;
-        -khtml-user-select: none;
-        -webkit-user-select: ignore;
+        @include no-select;
     }
 
     .#{$prefix}grid-row-body-hidden {
@@ -460,7 +430,7 @@
     }
 
     .#{$prefix}grid-row-expander {
-        background-image: theme-image($theme-name, 'grid/group-collapse.gif');
+        background-image: theme-background-image($theme-name, 'grid/group-collapse.gif');
         background-color: transparent;
 
         width: 9px;
@@ -474,7 +444,7 @@
 
     .#{$prefix}grid-row-collapsed {
         .#{$prefix}grid-row-expander {
-            background-image: theme-image($theme-name, 'grid/group-expand.gif');
+            background-image: theme-background-image($theme-name, 'grid/group-expand.gif');
         }
     }
 
@@ -501,11 +471,11 @@
     }
 
     .col-move-top {
-        background-image: theme-image($theme-name, 'grid/col-move-top.gif');
+        background-image: theme-background-image($theme-name, 'grid/col-move-top.gif');
     }
 
     .col-move-bottom {
-        background-image: theme-image($theme-name, 'grid/col-move-bottom.gif');
+        background-image: theme-background-image($theme-name, 'grid/col-move-bottom.gif');
     }
 
     //pading toolbar
@@ -538,7 +508,7 @@
 
     .#{$prefix}grid-group-title {
         background: transparent no-repeat 0 -1px;
-        background-image: theme-image($theme-name, 'grid/group-collapse.gif');
+        background-image: theme-background-image($theme-name, 'grid/group-collapse.gif');
 
         color: $grid-grouped-title-color;
         font: $grid-grouped-title-font;
@@ -548,7 +518,7 @@
 
     .#{$prefix}grid-group-hd-collapsed {
         .#{$prefix}grid-group-title {
-            background-image: theme-image($theme-name, 'grid/group-expand.gif');
+            background-image: theme-background-image($theme-name, 'grid/group-expand.gif');
         }
     }
 
@@ -557,15 +527,15 @@
     }
 
     .#{$prefix}grid-group-collapsed .#{$prefix}grid-group-title {
-        background-image: theme-image($theme-name, 'grid/group-expand.gif');
+        background-image: theme-background-image($theme-name, 'grid/group-expand.gif');
     }
 
     .#{$prefix}group-by-icon {
-        background-image: theme-image($theme-name, 'grid/group-by.gif');
+        background-image: theme-background-image($theme-name, 'grid/group-by.gif');
     }
 
     .#{$prefix}show-groups-icon {
-        background-image: theme-image($theme-name, 'grid/group-by.gif');
+        background-image: theme-background-image($theme-name, 'grid/group-by.gif');
     }
 
     .#{$prefix}column-header-checkbox .#{$prefix}column-header-inner {
@@ -580,7 +550,7 @@
     .#{$prefix}column-header-checkbox .#{$prefix}column-header-text {
         height: 14px;
         width: 14px;
-        background-image: theme-image($theme-name, 'grid/unchecked.gif');
+        background-image: theme-background-image($theme-name, 'grid/unchecked.gif');
         background-position: -1px -1px;
         background-repeat: no-repeat;
         background-color: transparent;
@@ -593,7 +563,7 @@
         margin-top: 4px;
         margin-left: 4px;
     }
-    
+
     @if $include-ie or $compile-all {
         /* All IE Quirks mode need to squish the header height or the line-height will become too tall */
         /* IE6 always needs the hack regardless of quirks/strict */
@@ -602,7 +572,7 @@
                 line-height: 18px;
             }
         }
-        
+
         /* IE 6, 7 & 9 are 1px too far to the right when centering, drop the margin 1px. */
         .#{$prefix}ie6, .#{$prefix}ie7, .#{$prefix}ie9 {
             .#{$prefix}column-header-checkbox .#{$prefix}column-header-text {
@@ -612,7 +582,7 @@
     }
 
     .#{$prefix}grid-hd-checker-on .#{$prefix}column-header-text {
-        background-image: theme-image($theme-name, 'grid/checked.gif');
+        background-image: theme-background-image($theme-name, 'grid/checked.gif');
     }
 
     .#{$prefix}grid-row-checker {
@@ -623,79 +593,79 @@
 
     .#{$prefix}grid-row-selected .#{$prefix}grid-row-checker,
     .#{$prefix}grid-row-checked .#{$prefix}grid-row-checker {
-        background-image: theme-image($theme-name, 'grid/checked.gif');
+        background-image: theme-background-image($theme-name, 'grid/checked.gif');
     }
 
     //grid icons
     .#{$prefix}tbar-page-first {
-        background-image: theme-image($theme-name, 'grid/page-first.gif') !important;
+        background-image: theme-background-image($theme-name, 'grid/page-first.gif') !important;
     }
 
     .#{$prefix}tbar-loading {
-        background-image: theme-image($theme-name, 'grid/refresh.gif') !important;
+        background-image: theme-background-image($theme-name, 'grid/refresh.gif') !important;
     }
 
     .#{$prefix}tbar-page-last {
-        background-image: theme-image($theme-name, 'grid/page-last.gif') !important;
+        background-image: theme-background-image($theme-name, 'grid/page-last.gif') !important;
     }
 
     .#{$prefix}tbar-page-next {
-        background-image: theme-image($theme-name, 'grid/page-next.gif') !important;
+        background-image: theme-background-image($theme-name, 'grid/page-next.gif') !important;
     }
 
     .#{$prefix}tbar-page-prev {
-        background-image: theme-image($theme-name, 'grid/page-prev.gif') !important;
+        background-image: theme-background-image($theme-name, 'grid/page-prev.gif') !important;
     }
 
     .#{$prefix}item-disabled {
         .#{$prefix}tbar-loading {
-            background-image: theme-image($theme-name, 'grid/refresh-disabled.gif') !important;
+            background-image: theme-background-image($theme-name, 'grid/refresh-disabled.gif') !important;
         }
 
         .#{$prefix}tbar-page-first {
-            background-image: theme-image($theme-name, 'grid/page-first-disabled.gif') !important;
+            background-image: theme-background-image($theme-name, 'grid/page-first-disabled.gif') !important;
         }
 
         .#{$prefix}tbar-page-last {
-            background-image: theme-image($theme-name, 'grid/page-last-disabled.gif') !important;
+            background-image: theme-background-image($theme-name, 'grid/page-last-disabled.gif') !important;
         }
 
         .#{$prefix}tbar-page-next {
-            background-image: theme-image($theme-name, 'grid/page-next-disabled.gif') !important;
+            background-image: theme-background-image($theme-name, 'grid/page-next-disabled.gif') !important;
         }
 
         .#{$prefix}tbar-page-prev {
-            background-image: theme-image($theme-name, 'grid/page-prev-disabled.gif') !important;
+            background-image: theme-background-image($theme-name, 'grid/page-prev-disabled.gif') !important;
         }
     }
 
     //menu icons
-    .xg-hmenu-sort-asc .#{$prefix}menu-item-icon {
-        background-image: theme-image($theme-name, 'grid/hmenu-asc.gif');
+    .#{$prefix}hmenu-sort-asc .#{$prefix}menu-item-icon {
+        background-image: theme-background-image($theme-name, 'grid/hmenu-asc.gif');
     }
 
-    .xg-hmenu-sort-desc .#{$prefix}menu-item-icon {
-        background-image: theme-image($theme-name, 'grid/hmenu-desc.gif');
+    .#{$prefix}hmenu-sort-desc .#{$prefix}menu-item-icon {
+        background-image: theme-background-image($theme-name, 'grid/hmenu-desc.gif');
     }
 
-    .xg-hmenu-lock .#{$prefix}menu-item-icon {
-        background-image: theme-image($theme-name, 'grid/hmenu-lock.gif');
+    .#{$prefix}hmenu-lock .#{$prefix}menu-item-icon {
+        background-image: theme-background-image($theme-name, 'grid/hmenu-lock.gif');
     }
 
-    .xg-hmenu-unlock .#{$prefix}menu-item-icon {
-        background-image: theme-image($theme-name, 'grid/hmenu-unlock.gif');
+    .#{$prefix}hmenu-unlock .#{$prefix}menu-item-icon {
+        background-image: theme-background-image($theme-name, 'grid/hmenu-unlock.gif');
     }
 
     .#{$prefix}group-by-icon {
-        background-image: theme-image($theme-name, 'grid/group-by.gif');
+        background-image: theme-background-image($theme-name, 'grid/group-by.gif');
     }
 
     .#{$prefix}cols-icon .#{$prefix}menu-item-icon {
-        background-image: theme-image($theme-name, 'grid/columns.gif');
+        background-image: theme-background-image($theme-name, 'grid/columns.gif');
     }
 
     .#{$prefix}show-groups-icon {
-        background-image: theme-image($theme-name, 'grid/group-by.gif');
+        background-image: theme-background-image($theme-name, 'grid/group-by.gif');
     }
 
     // Drag/drop indicator styles
@@ -710,7 +680,7 @@
             position: absolute;
             top: -8px;
             left: -12px;
-            background-image: theme-image($theme-name, 'grid/dd-insert-arrow-right.png');
+            background-image: theme-background-image($theme-name, 'grid/dd-insert-arrow-right.png');
             height: 16px;
             width: 16px;
         }
@@ -719,7 +689,7 @@
             position: absolute;
             top: -8px;
             right: -11px;
-            background-image: theme-image($theme-name, 'grid/dd-insert-arrow-left.png');
+            background-image: theme-background-image($theme-name, 'grid/dd-insert-arrow-left.png');
             height: 16px;
             width: 16px;
         }
@@ -727,11 +697,11 @@
 
     .#{$prefix}ie6 {
         .#{$prefix}grid-drop-indicator-left {
-            background-image: theme-image($theme-name, 'grid/dd-insert-arrow-right.gif');
+            background-image: theme-background-image($theme-name, 'grid/dd-insert-arrow-right.gif');
         }
 
         .#{$prefix}grid-drop-indicator-right {
-            background-image: theme-image($theme-name, 'grid/dd-insert-arrow-left.gif');
+            background-image: theme-background-image($theme-name, 'grid/dd-insert-arrow-left.gif');
         }
     }
 
@@ -742,8 +712,13 @@
         zoom: 1;
         overflow: visible !important;
 
-        .#{$prefix}form-field, .#{$prefix}form-display-field {
+        .#{$prefix}form-field {
+            font: $grid-row-editor-font;
+        }
+        .#{$prefix}form-display-field {
             font: $grid-row-editor-font;
+            padding-top: 0;
+            padding-left: 4px;
         }
 
         .#{$prefix}panel-body {
@@ -794,7 +769,7 @@
             width: 4px;
             height: 4px;
             bottom: 0px;
-            background-image: theme-image($theme-name, 'panel/panel-default-framed-corners.gif');
+            background-image: theme-background-image($theme-name, 'panel/panel-default-framed-corners.gif');
         }
         &-bl {
             left: 0px;