X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/6746dc89c47ed01b165cc1152533605f97eb8e8d..refs/heads/master:/resources/themes/stylesheets/ext4/default/widgets/_tree.scss diff --git a/resources/themes/stylesheets/ext4/default/widgets/_tree.scss b/resources/themes/stylesheets/ext4/default/widgets/_tree.scss index a09d06eb..b7029d67 100644 --- a/resources/themes/stylesheets/ext4/default/widgets/_tree.scss +++ b/resources/themes/stylesheets/ext4/default/widgets/_tree.scss @@ -71,43 +71,43 @@ //elbows .#{$prefix}tree-lines { .#{$prefix}tree-elbow { - background-image: theme-image($theme-name, 'tree/elbow.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow.gif'); } .#{$prefix}tree-elbow-end { - background-image: theme-image($theme-name, 'tree/elbow-end.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-end.gif'); } .#{$prefix}tree-elbow-plus { - background-image: theme-image($theme-name, 'tree/elbow-plus.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-plus.gif'); } .#{$prefix}tree-elbow-end-plus { - background-image: theme-image($theme-name, 'tree/elbow-end-plus.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-end-plus.gif'); } .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-plus { - background-image: theme-image($theme-name, 'tree/elbow-minus.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-minus.gif'); } .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-end-plus { - background-image: theme-image($theme-name, 'tree/elbow-end-minus.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-end-minus.gif'); } .#{$prefix}tree-elbow-line { - background-image: theme-image($theme-name, 'tree/elbow-line.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-line.gif'); } } .#{$prefix}tree-no-lines { .#{$prefix}tree-elbow-plus, .#{$prefix}tree-elbow-end-plus { - background-image: theme-image($theme-name, 'tree/elbow-plus-nl.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-plus-nl.gif'); } .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-plus, .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-end-plus { - background-image: theme-image($theme-name, 'tree/elbow-end-minus-nl.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-end-minus-nl.gif'); } } @@ -116,7 +116,7 @@ .#{$prefix}tree-elbow-minus, .#{$prefix}tree-elbow-end-plus, .#{$prefix}tree-elbow-end-minus { - background-image: theme-image($theme-name, 'tree/arrows.gif'); + background-image: theme-background-image($theme-name, 'tree/arrows.gif'); } } @@ -136,16 +136,16 @@ .#{$prefix}tree-icon-leaf { width: $tree-elbow-width; - background-image: theme-image($theme-name, 'tree/leaf.gif'); + background-image: theme-background-image($theme-name, 'tree/leaf.gif'); } .#{$prefix}tree-icon-parent { width: $tree-elbow-width; - background-image: theme-image($theme-name, 'tree/folder.gif'); + background-image: theme-background-image($theme-name, 'tree/folder.gif'); } .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-icon-parent { - background-image: theme-image($theme-name, 'tree/folder-open.gif'); + background-image: theme-background-image($theme-name, 'tree/folder-open.gif'); } .#{$prefix}grid-rowbody { @@ -155,7 +155,7 @@ .#{$prefix}tree-panel .#{$prefix}grid-cell-inner { padding: 0px; } - + .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell { border: none; } @@ -164,29 +164,26 @@ height: $tree-elbow-height; line-height: $tree-elbow-height; - vertical-align: middle; cursor: pointer; + white-space: nowrap; + vertical-align: middle; img { - float: left; - } - } - - .#{$prefix}ie { - .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner { - white-space: normal; + margin-top: 0; + display: inline-block; + vertical-align: top; } } - .#{$prefix}tree-checkbox { - float: left; margin: 2px 3px 0 0; - display: block; + display: inline-block; + vertical-align: top; width: $form-checkbox-size; height: $form-checkbox-size; - background: theme-image($theme-name, $form-checkbox-image) no-repeat; + background: no-repeat; + background-image: theme-background-image($theme-name, $form-checkbox-image); overflow: hidden; padding: 0; @@ -196,6 +193,7 @@ border: 0; } } + @if $include-ie { /* Hack for IE; causes alignment problem in IE9 standards mode so exclude that */ .#{$prefix}nbr.#{$prefix}ie { @@ -212,6 +210,25 @@ .#{$prefix}tree-panel .#{$prefix}grid-cell-inner { border-width: 0 !important; } + + .#{$prefix}ie6 .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img, + .#{$prefix}quirks .#{$prefix}ie .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img { + margin-top: -1px; + vertical-align: middle; + } + .#{$prefix}strict .#{$prefix}ie7 .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img { + margin-top: -3px; + vertical-align: middle; + } + .#{$prefix}ie6 .#{$prefix}tree-checkbox, + .#{$prefix}quirks .#{$prefix}ie7 .#{$prefix}tree-checkbox { + margin-top: 0; + vertical-align: middle; + } + .#{$prefix}strict .#{$prefix}ie7 .#{$prefix}tree-checkbox { + margin-top: -2px; + vertical-align: middle; + } } @if $include-ff { @@ -223,23 +240,23 @@ } .#{$prefix}tree-drop-ok-append .#{$prefix}dd-drop-icon { - background-image: theme-image($theme-name, 'tree/drop-append.gif'); + background-image: theme-background-image($theme-name, 'tree/drop-append.gif'); } .#{$prefix}tree-drop-ok-above .#{$prefix}dd-drop-icon { - background-image: theme-image($theme-name, 'tree/drop-above.gif'); + background-image: theme-background-image($theme-name, 'tree/drop-above.gif'); } .#{$prefix}tree-drop-ok-below .#{$prefix}dd-drop-icon { - background-image: theme-image($theme-name, 'tree/drop-below.gif'); + background-image: theme-background-image($theme-name, 'tree/drop-below.gif'); } .#{$prefix}tree-drop-ok-between .#{$prefix}dd-drop-icon { - background-image: theme-image($theme-name, 'tree/drop-between.gif'); + background-image: theme-background-image($theme-name, 'tree/drop-between.gif'); } .#{$prefix}grid-tree-loading .#{$prefix}tree-icon { - background-image: theme-image($theme-name, 'tree/loading.gif'); + background-image: theme-background-image($theme-name, 'tree/loading.gif'); } .#{$prefix}tree-ddindicator {