@@ -29,10 +29,6 @@ | |||
cursor: default; | |||
} | |||
.v-ie6 .v-button { | |||
display: inline; | |||
} | |||
.v-ie7 .v-button { | |||
display: inline; | |||
} | |||
@@ -117,10 +113,7 @@ | |||
zoom: 1; | |||
float: none; | |||
} | |||
/* Fixes streched buttons in IE6 and IE7*/ | |||
.v-ie6 .v-nativebutton { | |||
width: 1px; | |||
} | |||
/* Fixes stretched buttons in IE7*/ | |||
.v-ie .v-nativebutton { | |||
overflow: visible; | |||
padding-left: 1em; | |||
@@ -147,8 +140,7 @@ | |||
white-space: nowrap; | |||
} | |||
/* Fix for IE6/IE7 issue where checkbox moves 1 pixel down after selection (#4636) */ | |||
.v-ie6 .v-checkbox, | |||
/* Fix for IE7 issue where checkbox moves 1 pixel down after selection (#4636) */ | |||
.v-ie7 .v-checkbox { | |||
vertical-align: baseline; | |||
} |
@@ -29,14 +29,6 @@ | |||
overflow: hidden; | |||
} | |||
/* Fix IE6 "double-float-margin-bug" */ | |||
.v-ie6 .v-errorindicator, | |||
.v-ie6 .v-icon, | |||
.v-ie6 .v-captiontext, | |||
.v-ie6 .v-required-field-indicator { | |||
display: inline; | |||
} | |||
.v-ie9 .v-gridlayout-margin>div>div>.v-caption, | |||
.v-ie9 .v-verticallayout>div>div>.v-caption, | |||
.v-ie9 .v-horizontallayout>div>div>.v-caption { |
@@ -61,11 +61,9 @@ | |||
outline: 1px dotted black; | |||
} | |||
.v-ie6 .v-datefield-calendarpanel-day, | |||
.v-ie7 .v-datefield-calendarpanel-day { | |||
margin: 1px; | |||
} | |||
.v-ie6 .v-datefield-calendarpanel-day-focused, | |||
.v-ie7 .v-datefield-calendarpanel-day-focused { | |||
border: 1px dotted black; | |||
margin: 0px; | |||
@@ -95,8 +93,6 @@ | |||
} | |||
*/ | |||
/* IE somehow loses generic v-disabled alpha. See #1960 */ | |||
.v-ie6 .v-disabled .v-datefield-button, | |||
.v-ie6 .v-disabled .v-datefield-textfield, | |||
.v-ie7 .v-disabled .v-datefield-button, | |||
.v-ie7 .v-disabled .v-datefield-textfield { | |||
filter: alpha(opacity=30); |
@@ -24,7 +24,6 @@ | |||
overflow: hidden; | |||
} | |||
/* Ensure that resizing gridlayout works in IE */ | |||
.v-ie6 .v-gridlayout, | |||
.v-ie7 .v-gridlayout { | |||
overflow: hidden; | |||
} |
@@ -32,9 +32,6 @@ | |||
padding-left: 0; | |||
} | |||
/* To make sure IE don't expand elements larger than they should */ | |||
.v-ie6 .v-orderedlayout, | |||
.v-ie6 .v-horizontallayout, | |||
.v-ie6 .v-verticallayout, | |||
.v-ie7 .v-orderedlayout, | |||
.v-ie7 .v-horizontallayout, | |||
.v-ie7 .v-verticallayout { |
@@ -66,20 +66,3 @@ | |||
width: 10px; height: 10px; | |||
background: transparent url(img/bottom-right.png); | |||
} | |||
/* For IE6 (no transparent png's, we use a blur filter) */ | |||
.v-ie6 .v-shadow * { | |||
display: none; | |||
} | |||
.v-ie6 .v-shadow { | |||
background: #000; | |||
filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2) alpha(opacity=20); | |||
margin-top: -2px; | |||
margin-left: -2px; | |||
} |
@@ -63,15 +63,3 @@ | |||
background: #FFE0E0; | |||
} | |||
*/ | |||
/* IE specific styles */ | |||
.v-ie6 .v-slider, | |||
.v-ie6 .v-slider-vertical { | |||
margin: 0; | |||
} | |||
.v-ie6 .v-slider .v-slider-handle { | |||
margin: -1px 0; | |||
} | |||
.v-ie6 .v-slider-vertical .v-slider-handle { | |||
margin: 0 -1px; | |||
} |
@@ -34,11 +34,6 @@ | |||
cursor: default; | |||
} | |||
/* IE specific styles */ | |||
.v-ie6 .v-splitpanel-hsplitter div { | |||
height: 99%; | |||
} | |||
.v-ie6 .v-splitpanel-first-container, | |||
.v-ie6 .v-splitpanel-second-container, | |||
.v-ie7 .v-splitpanel-first-container, | |||
.v-ie7 .v-splitpanel-second-container { | |||
position: relative; |
@@ -181,7 +181,6 @@ | |||
position: relative; /* hide this from IE, it works without it */ | |||
cursor: pointer; | |||
} | |||
.v-ie6 .v-table-column-selector, | |||
.v-ie7 .v-table-column-selector { | |||
position: static; | |||
} |
@@ -81,13 +81,9 @@ | |||
cursor: default; | |||
visibility: hidden; | |||
} | |||
.v-tabsheet-tabitem:hover .v-tabsheet-caption-close, | |||
.v-ie6 .v-tabsheet-caption-close { | |||
.v-tabsheet-tabitem:hover .v-tabsheet-caption-close { | |||
visibility: visible; | |||
} | |||
.v-ie6 .v-tabsheet-caption-close { | |||
float: right; | |||
} | |||
.v-tabsheet-tabitem { | |||
border: 1px solid #aaa; | |||
border-right: none; | |||
@@ -111,7 +107,6 @@ | |||
border-bottom: none; | |||
position: relative; | |||
} | |||
.v-ie6 .v-tabsheet-content, | |||
.v-ie7 .v-tabsheet-content { | |||
zoom: 1; | |||
} |
@@ -33,17 +33,3 @@ | |||
.v-tree-connectors .v-tree-node-drag-top.v-tree-node-leaf { | |||
background-position: 2px 50%; | |||
} | |||
/* IE6 */ | |||
.v-ie6 .v-tree-connectors .v-tree-node { | |||
background: transparent url(img/connector-expand-ie6.png) no-repeat 2px -52px; | |||
} | |||
.v-ie6 .v-tree-connectors .v-tree-node-expanded { | |||
background: transparent url(img/connector-collapse-ie6.png) no-repeat 2px -52px; | |||
} | |||
.v-ie6 .v-tree-connectors .v-tree-node-last { | |||
background: transparent url(img/connector-expand-last-ie6.png) no-repeat 2px -52px; | |||
} | |||
.v-ie6 .v-tree-connectors .v-tree-node-last.v-tree-node-expanded { | |||
background: transparent url(img/connector-collapse-last-ie6.png) no-repeat 2px -52px; | |||
} |
@@ -37,27 +37,6 @@ div.v-tree-node-leaf { | |||
.v-tree-node-children { | |||
padding-left: 1em; | |||
} | |||
/* ie6compatnode is hidden from non ie6 browsers, for ie6 | |||
* uses weird hack to sink all events properly | |||
*/ | |||
.v-tree-node-ie6compatnode { | |||
display: none; | |||
} | |||
/* IMPORTANT keep the offsetWidth of this element the same as the margin-left of v-tree-node-caption */ | |||
.v-ie6 .v-tree-node-ie6compatnode { | |||
display: inline; | |||
float: left; | |||
background: orange; | |||
margin: 0; | |||
width: 0.8em; | |||
height: 0.8em; | |||
padding: 0.1em; | |||
filter: alpha(opacity=0); | |||
} | |||
.v-ie6 .v-tree-node, | |||
.v-ie6 .v-tree-node-children { | |||
clear: left; | |||
} | |||
/*************************************** | |||
* Drag'n'drop styles | |||
***************************************/ | |||
@@ -106,9 +85,6 @@ div.v-tree-node-leaf { | |||
margin: -2px 2px -2px -2px; | |||
background-color: #bcdcff; | |||
} | |||
.v-ie6 .v-tree .v-tree-node-caption-drag-center div { | |||
margin: -2px ; | |||
} | |||
.v-tree .v-tree-node-caption-drag-center div { | |||
background-color: rgba(169,209,255,.6); | |||
} |
@@ -13,18 +13,10 @@ | |||
background: url(../treetable/img/arrow-right.png) right center no-repeat; | |||
} | |||
.v-ie6 .v-treetable-node-closed { | |||
background-image: url(../treetable/img/arrow-right.gif); | |||
} | |||
.v-treetable-node-open { | |||
background: url(../treetable/img/arrow-down.png) right center no-repeat; | |||
} | |||
.v-ie6 .v-treetable-node-open { | |||
background-image: url(../treetable/img/arrow-down.gif); | |||
} | |||
.v-treetable .v-checkbox { | |||
display: inline-block; | |||
padding-bottom: 4px; |
@@ -2,7 +2,6 @@ | |||
white-space: nowrap; | |||
} | |||
.v-ie6 .v-upload, | |||
.v-ie7 .v-upload { | |||
margin:0; | |||
} |
@@ -17,9 +17,6 @@ div.v-window-header { | |||
overflow: hidden; | |||
padding: 0; | |||
} | |||
.v-ie6 .v-window-header { | |||
width: 100%; | |||
} | |||
.v-window-header .v-icon { | |||
vertical-align: middle; /* This has to be 'middle', not 'bottom', to allow larger icons than 16px */ | |||
} | |||
@@ -77,15 +74,6 @@ div.v-window-header { | |||
height: 100%; | |||
filter: alpha(opacity=50); | |||
} | |||
/* IE6 workaround for position:fixed; */ | |||
.v-ie6 .v-window-modalitycurtain { | |||
position: absolute; | |||
top: expression(document.documentElement.scrollTop + "px"); | |||
} | |||
/* min-width for IE6 */ | |||
.v-ie6 .v-window { | |||
width: 0; /* */ | |||
} | |||
/* Shadow for window */ | |||
.v-shadow-window { | |||
position: absolute; | |||
@@ -147,13 +135,3 @@ div.v-window-header { | |||
width: 28px; height: 28px; | |||
background: transparent url(img/shadow/bottom-right.png); | |||
} | |||
/* For IE6 (no transparent png's, we use a blur filter) */ | |||
.v-ie6 .v-shadow-window * { | |||
display: none; | |||
} | |||
.v-ie6 .v-shadow-window { | |||
background: #000; | |||
filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=5) alpha(opacity=20); | |||
margin-top: 2px; | |||
margin-left: 2px; | |||
} |
@@ -98,16 +98,6 @@ | |||
overflow: hidden; | |||
} | |||
.v-ie6 .v-window, | |||
.v-ie6 .v-popupview-popup, | |||
.v-ie6 .v-filterselect-suggestpopup, | |||
.v-ie6 .v-datefield-popup, | |||
.v-ie6 .v-contextmenu, | |||
.v-ie6 .v-Notification, | |||
.v-ie6 .v-menubar-submenu { | |||
background-image: none; | |||
} | |||
.v-filterselect-suggestpopup, | |||
.v-contextmenu, | |||
.v-menubar-submenu { |
@@ -14,10 +14,6 @@ | |||
border-style: solid none; | |||
} | |||
.v-ie6 .v-accordion-item-caption { | |||
background-image: none; | |||
} | |||
div.v-accordion-item-caption, | |||
div.v-accordion-item-open .v-accordion-item-caption:active { | |||
background-color: transparent; |
@@ -22,10 +22,6 @@ div.v-button-down .v-button-wrap { | |||
background-image: url(../../img/grad-dark-top2.png); | |||
} | |||
.v-ie6 div.v-button-down .v-button-wrap { | |||
background-image: none; | |||
} | |||
.v-button { | |||
overflow: hidden; | |||
} | |||
@@ -66,16 +62,6 @@ div.v-button-down .v-button-wrap { | |||
overflow: hidden; | |||
} | |||
body.v-ie6 .v-button { | |||
background-image: none; | |||
} | |||
body.v-ie6 .v-button .v-button-wrap { | |||
background-image: none; | |||
display: inline; | |||
zoom: 1; | |||
} | |||
.v-button:focus { | |||
outline: none; | |||
} | |||
@@ -263,17 +249,14 @@ body.v-ie .v-pressed.v-button-borderless .v-button-wrap { | |||
margin-right: -0.5em; | |||
} | |||
.v-ie6 .v-button-icon-on-right, | |||
.v-ie7 .v-button-icon-on-right { | |||
position: relative; | |||
} | |||
.v-ie6 .v-button-icon-on-right .v-button-caption, | |||
.v-ie7 .v-button-icon-on-right .v-button-caption { | |||
padding-right: 14px; | |||
} | |||
.v-ie6 .v-button-icon-on-right .v-icon, | |||
.v-ie7 .v-button-icon-on-right .v-icon { | |||
position: absolute; | |||
right: 0; |
@@ -23,7 +23,6 @@ | |||
height: 1.2em; | |||
} | |||
.v-ie6 .v-datefield-button, | |||
.v-ie7 .v-datefield-button { | |||
height: 1.55em; | |||
margin-top: 1px; | |||
@@ -116,10 +115,6 @@ td.v-datefield-calendarpanel-month { | |||
text-shadow: 0 1px 0 rgba(255,255,255,.7); | |||
} | |||
.v-ie6 td.v-datefield-calendarpanel-month { | |||
background-image: none; | |||
} | |||
span.v-datefield-calendarpanel-month { | |||
display: block; | |||
text-align: center; | |||
@@ -172,10 +167,6 @@ td.v-datefield-calendarpanel-nextyear { | |||
background-position: 0 0; | |||
} | |||
.v-ie6 .v-datefield-calendarpanel-header button { | |||
background-image: none; | |||
} | |||
.v-datefield-calendarpanel-header button:active { | |||
background-image: url(../../img/grad-dark-top2.png); | |||
} | |||
@@ -239,10 +230,6 @@ td.v-datefield-calendarpanel-nextyear { | |||
margin-bottom: 2px; | |||
} | |||
.v-ie6 .v-datefield-calendarpanel-weekdays strong { | |||
background-image: none; | |||
} | |||
.v-datefield-calendarpanel .v-first strong { | |||
-webkit-border-bottom-left-radius: 3px; | |||
-moz-border-radius-bottomleft: 3px; | |||
@@ -293,10 +280,6 @@ td.v-datefield-calendarpanel-nextyear { | |||
border: 1px solid #c9c9c9; | |||
} | |||
.v-ie6 .v-datefield-calendarpanel-day-today { | |||
background-image: none; | |||
} | |||
.v-datefield-calendarpanel-day-selected, | |||
.v-datefield-calendarpanel-day-selected:hover { | |||
margin: 0 0 0 .3em; |
@@ -5,10 +5,6 @@ | |||
border-width: 1px 0; | |||
} | |||
.v-ie6 .v-menubar { | |||
background-image: none; | |||
} | |||
.v-menubar .v-menubar-menuitem { | |||
padding: .2em .5em; | |||
line-height: normal; | |||
@@ -26,7 +22,3 @@ | |||
background-image: url(../../img/grad-light-top2.png); | |||
background-position: 0 -1px; | |||
} | |||
.v-ie6 .v-menubar-submenu .v-menubar-menuitem-selected { | |||
background-image: none; | |||
} |
@@ -47,10 +47,6 @@ div.v-Notification-tray { | |||
text-shadow: 0 1px 1px rgba(0,0,0,.5); | |||
} | |||
.v-ie6 .v-Notification-tray { | |||
background-image: none; | |||
} | |||
.v-Notification-tray h1 { | |||
font-size: 14px; | |||
line-height: 18px; |
@@ -87,10 +87,6 @@ div.v-panel-content-light { | |||
padding: .3em .6em; | |||
} | |||
.v-ie6 .v-panel-bubble .v-panel-caption-bubble { | |||
background-image: none; | |||
} | |||
.v-panel-nocaption-bubble { | |||
padding: 0; | |||
margin: 0; |
@@ -18,11 +18,6 @@ | |||
border: 1px solid #b3b3b3; | |||
} | |||
.v-ie6 .v-progressindicator-wrapper, | |||
.v-ie6 .v-progressindicator-indicator { | |||
background-image: none; | |||
} | |||
/******************************************************************************* | |||
* Small |
@@ -84,13 +84,6 @@ body .v-filterselect-suggestpopup-big td { | |||
-ms-user-select: none; | |||
} | |||
.v-ie6 .v-filterselect-prevpage-off, | |||
.v-ie6 .v-filterselect-nextpage-off, | |||
.v-ie6 .v-filterselect-prevpage, | |||
.v-ie6 .v-filterselect-nextpage { | |||
background-image: none; | |||
} | |||
.v-filterselect-prevpage:active, | |||
.v-filterselect-nextpage:active { | |||
background-image: (../../img/grad-dark-bottom2.png); | |||
@@ -126,10 +119,6 @@ body .v-filterselect-suggestpopup-big td { | |||
background-position: 0 -1px; | |||
} | |||
.v-ie6 .v-filterselect-suggestmenu .gwt-menuItem-selected { | |||
background-image: none; | |||
} | |||
.v-filterselect-suggestpopup-small .v-filterselect-status { | |||
font-size: .8em; | |||
} | |||
@@ -156,10 +145,6 @@ body .v-filterselect-suggestpopup-big td { | |||
padding: .3em .5em; | |||
} | |||
.v-ie6 .v-filterselect-select-button { | |||
background-image: none; | |||
} | |||
.v-filterselect-select-button .v-filterselect-input { | |||
display: block; | |||
width: 100% !important; | |||
@@ -176,10 +161,3 @@ body .v-filterselect-suggestpopup-big td { | |||
height: 100%; | |||
background-position: 100% -8px; | |||
} | |||
.v-ie6 .v-filterselect-select-button .v-filterselect-button { | |||
float: none; | |||
position: relative; | |||
margin: -1.8em -.5em -.3em -.5em; | |||
padding: .3em .5em; | |||
} |
@@ -42,10 +42,6 @@ | |||
border-width: 0 1px; | |||
} | |||
.v-ie6 .v-slider-vertical { | |||
width: 6px; | |||
} | |||
.v-slider-vertical .v-slider-base { | |||
background-image: none; | |||
width: 4px; | |||
@@ -58,8 +54,3 @@ | |||
margin: 0; | |||
margin-left: -5px; | |||
} | |||
.v-ie6 .v-slider-base, | |||
.v-ie6 .v-slider-handle { | |||
background-image: none; | |||
} |
@@ -5,11 +5,6 @@ | |||
width: 9px; | |||
} | |||
.v-ie6 .v-splitpanel-hsplitter div, | |||
.v-ie6 .v-splitpanel-vsplitter div { | |||
background-image: url(../../img/split-handle-ie6.png); | |||
} | |||
.v-splitpanel-vsplitter div { | |||
background-position: 50% 2px; | |||
margin: -1px 0; | |||
@@ -35,13 +30,6 @@ | |||
background: #b3b3b3 url(../../img/grad-light-top.png) repeat-x; | |||
} | |||
.v-ie6 .v-splitpanel-hsplitter, | |||
.v-ie6 .v-splitpanel-hsplitter-locked, | |||
.v-ie6 .v-splitpanel-vsplitter, | |||
.v-ie6 .v-splitpanel-vsplitter-locked { | |||
background-image: none; | |||
} | |||
/******************************************************************************* | |||
* Small | |||
******************************************************************************/ | |||
@@ -61,11 +49,6 @@ body .v-splitpanel-vsplitter-small-locked { | |||
line-height: 1px; | |||
} | |||
body.v-ie6 .v-splitpanel-vsplitter-small, | |||
body.v-ie6 .v-splitpanel-vsplitter-small-locked { | |||
overflow: hidden; | |||
} | |||
.v-splitpanel-hsplitter-small div { | |||
width: 7px; | |||
margin-left: -2px; | |||
@@ -78,8 +61,3 @@ body.v-ie6 .v-splitpanel-vsplitter-small-locked { | |||
background: transparent; | |||
overflow: hidden; | |||
} | |||
.v-ie6 .v-splitpanel-hsplitter-small div, | |||
.v-ie6 .v-splitpanel-vsplitter-small div { | |||
background-image: none; | |||
} |
@@ -5,11 +5,6 @@ | |||
line-height: normal; | |||
} | |||
.v-ie6 .v-table-header-wrap, | |||
.v-ie6 .v-table-header-drag { | |||
background-image: none; | |||
} | |||
.v-table-caption-container, | |||
.v-table-header-drag { | |||
padding-top: .2em; | |||
@@ -52,10 +47,6 @@ div.v-table-focus-slot-left { | |||
background-position: 0 -1px; | |||
} | |||
.v-ie6 .v-table tr.v-selected { | |||
background-image: none; | |||
} | |||
div.v-table-focus-slot-right { | |||
background: transparent; | |||
border-right: 2px solid #b3b3b3; |
@@ -36,10 +36,6 @@ | |||
-moz-border-radius-topright: 2px; | |||
} | |||
.v-ie6 .v-tabsheet-tabitem-selected .v-caption { | |||
background-image: none; | |||
} | |||
.v-tabsheet-content { | |||
background: #fff; | |||
border-color: #b3b3b3; | |||
@@ -62,10 +58,6 @@ | |||
margin: .2em 0 0 0; | |||
} | |||
.v-ie6 .v-tabsheet-caption-close { | |||
background-image: url(../../img/close-btn-ie6.png); | |||
} | |||
.v-tabsheet-caption-close:hover { | |||
background-position: .5em -25px; | |||
} | |||
@@ -89,10 +81,6 @@ | |||
-moz-border-radius: 6px; | |||
} | |||
.v-ie6 .v-tabsheet-scroller { | |||
background-image: none; | |||
} | |||
.v-tabsheet-scrollerPrev, | |||
.v-tabsheet-scrollerNext, | |||
.v-tabsheet-scrollerPrev-disabled, | |||
@@ -110,13 +98,6 @@ | |||
filter: alpha(opacity=50); | |||
} | |||
.v-ie6 .v-tabsheet-scrollerPrev, | |||
.v-ie6 .v-tabsheet-scrollerNext, | |||
.v-ie6 .v-tabsheet-scrollerPrev-disabled, | |||
.v-ie6 .v-tabsheet-scrollerNext-disabled{ | |||
background-image: url(../../img/tab-arrows-ie6.png); | |||
} | |||
.v-tabsheet-scroller button::-moz-focus-inner { | |||
border: none; | |||
padding: 0; |
@@ -123,8 +123,3 @@ input.v-textfield-search[type=text], | |||
.v-filterselect-search { | |||
padding-left: 17px; | |||
} | |||
.v-ie6 input.v-textfield-search { | |||
/* Compensate for big style as well, since IE6 doesn't handle the selector */ | |||
padding-left: 21px; | |||
} |
@@ -11,10 +11,6 @@ | |||
z-index: 2; | |||
} | |||
.v-ie6 .v-window-closebox { | |||
background-image: url(../../img/close-btn-ie6.png); | |||
} | |||
.v-window-closebox:hover { | |||
background-position: 0 -25px; | |||
} | |||
@@ -35,10 +31,6 @@ | |||
background-repeat: repeat-x; | |||
} | |||
.v-ie6 .v-window-wrap { | |||
background: transparent !important; | |||
} | |||
.v-window-outerheader { | |||
padding: .2em 1.7em .5em 1.2em; | |||
height: auto; |
@@ -33,11 +33,6 @@ | |||
color: #fff; | |||
} | |||
.v-ie6 .sidebar-menu .tab-selected, | |||
.v-ie6 .sidebar-menu .selected { | |||
background-image: none; | |||
} | |||
.sidebar-menu .tab-selected:focus, | |||
.sidebar-menu .selected:focus { | |||
outline: none; |
@@ -4,10 +4,6 @@ | |||
border-width: 1px 0; | |||
} | |||
.v-ie6 .v-csslayout-toolbar { | |||
background-image: none; | |||
} | |||
.v-csslayout-toolbar .v-csslayout-margin { | |||
margin: 3px .3em 2px; | |||
padding-bottom: 1px; |
@@ -50,11 +50,6 @@ | |||
line-height: 16px; | |||
} | |||
.v-ie6 .v-button .v-button-wrap { | |||
display: inline; | |||
zoom: 1; | |||
} | |||
/* Link style button */ | |||
.v-button-link, | |||
.v-disabled.v-button-link, |
@@ -33,7 +33,3 @@ div.v-app { | |||
font-weight: bold; | |||
margin: 1px 0 4px 0; | |||
} | |||
.v-ie6 .v-view { | |||
border-top: none; | |||
} |
@@ -116,8 +116,6 @@ span.v-datefield-calendarpanel-month { | |||
min-width: 22px; | |||
} | |||
.v-ie6 .v-datefield-calendarpanel-prevyear button, | |||
.v-ie6 .v-datefield-calendarpanel-nextyear button, | |||
.v-ie7 .v-datefield-calendarpanel-prevyear button, | |||
.v-ie7 .v-datefield-calendarpanel-nextyear button { | |||
width: 22px; |
@@ -7,10 +7,6 @@ select { | |||
background-color: #fff; | |||
} | |||
.v-ie6 select { | |||
font-size: 1em; | |||
} | |||
.v-filterselect-button { | |||
width: 24px; | |||
height: 24px; |
@@ -132,7 +132,6 @@ | |||
.v-tabsheet-caption-close { | |||
background: transparent url(close.png) no-repeat right top; | |||
-background-image: url(close-ie6.png); | |||
cursor: default; | |||
float: right; | |||
margin: 3px -1px 0; |
@@ -1,6 +1,5 @@ | |||
.v-tree-node { | |||
background: transparent url(arrows_sprites.png) no-repeat -42px 1px; | |||
-background: transparent url(arrows_sprites-ie6.png) no-repeat -42px 1px; | |||
} | |||
.v-tree-node span { |
@@ -10,21 +10,10 @@ | |||
background: #fff url(top-left.png) no-repeat; | |||
} | |||
.v-ie6 .v-window-wrap, | |||
.v-ie7 .v-window-wrap { | |||
background-position: 1px 1px; | |||
} | |||
.v-ie6 .v-window-wrap { | |||
border-bottom: none; | |||
} | |||
.v-ie6 .v-window-footer { | |||
border-bottom: 1px solid #c8c9ca; | |||
margin-top: -1px; | |||
padding-top: 1px; | |||
} | |||
.v-window-outerheader { | |||
height: 16px; | |||
margin-left: 9px; |
@@ -1,75 +1,5 @@ | |||
.v-ie6 .v-nativebutton-link, | |||
.v-ie7 .v-nativebutton-link, | |||
.v-ie8 .v-nativebutton-link { | |||
padding: 0; | |||
text-align: left; | |||
} | |||
/** | |||
* IE6 buttons -------------------------- | |||
*/ | |||
.v-ie6 .v-button { | |||
border: 1px solid #b3b3b3; | |||
border-bottom-color: #9a9a9a; | |||
background: #d8d8d8 url(img/right.png) no-repeat 0 -1px; | |||
padding: 0 15px; | |||
height: 23px; | |||
} | |||
.v-ie6 .v-button .v-button-wrap { | |||
background: transparent; | |||
height: 20px; | |||
padding: 3px 0 0; | |||
display: inline; | |||
zoom: 1; | |||
} | |||
.v-ie6 .v-button-primary { | |||
background-image: url(img/primary-right.png); | |||
} | |||
.v-ie6 .v-button-small { | |||
background-image: url(img/small-right.png); | |||
height: 17px; | |||
} | |||
.v-ie6 .v-button-small .v-button-wrap { | |||
height: 17px; | |||
padding: 0; | |||
} | |||
.v-ie6 .v-button.v-pressed { | |||
background: transparent url(img/right-pressed.png) no-repeat 0 -1px; | |||
} | |||
/* Buttons on blue background */ | |||
.v-ie6 .blue .v-button { | |||
border-color: #84949c; | |||
border-top-color: #83939b; | |||
border-bottom-color: #888d91; | |||
} | |||
/* Buttons on black background */ | |||
.v-ie6 .black .v-button { | |||
border: 1px solid #0d0e0f; | |||
background: #202224 url(img/black/right.png) no-repeat 0 -1px; | |||
color: #c9ccce; | |||
} | |||
.v-ie6 .black .v-button-primary { | |||
background-image: url(img/black/primary-right.png); | |||
} | |||
.v-ie6 .black .v-button-small { | |||
background-image: url(img/black/small-right.png); | |||
} | |||
.v-ie6 .black .v-button.v-pressed { | |||
background-image: url(img/black/right-pressed.png); | |||
} | |||
/* Link style button */ | |||
.v-ie6 .v-button-link, | |||
.v-ie6 .black .v-button-link { | |||
background: transparent; | |||
border: none; | |||
height: auto; | |||
line-height: normal; | |||
padding: 0; | |||
} | |||
.v-ie6 .v-button-link .v-button-wrap, | |||
.v-ie6 .black .v-button-link .v-button-wrap { | |||
padding: 0; | |||
height: auto; | |||
} |
@@ -44,9 +44,6 @@ | |||
height: 16px; | |||
background: transparent url(../common/icons/error.png) no-repeat 50%; | |||
} | |||
.v-ie6 .v-errorindicator { | |||
background-image: url(../common/icons/error-ie6.png); | |||
} | |||
.v-tooltip { | |||
background-color: #fffcdd; | |||
border: 1px solid #b8b295; |
@@ -120,10 +120,6 @@ td.v-datefield-calendarpanel-nextyear { | |||
.v-ie .v-datefield-calendarpanel-nextmonth button { | |||
border: none; | |||
} | |||
.v-ie6 .v-datefield-calendarpanel-prevmonth button, | |||
.v-ie6 .v-datefield-calendarpanel-nextmonth button { | |||
width: 24px; | |||
} | |||
.v-datefield-calendarpanel-nextmonth button { | |||
background-image: url(img/month-next.png); /** sprite-ref: verticals; sprite-alignment: center */ | |||
} | |||
@@ -289,11 +285,6 @@ td.v-datefield-calendarpanel-nextyear { | |||
background-image: url(img/popup-btn-black-pressed.png); /** sprite-ref: black-verticals */ | |||
} | |||
/* Small adjustment for IE6 */ | |||
.v-ie6 .v-datefield-popupcalendar .v-datefield-button { | |||
margin-top: 1px; | |||
} | |||
/*------------ | |||
* on black background |
@@ -6,9 +6,6 @@ | |||
height: 16px; | |||
background: transparent url(../common/icons/error.png) no-repeat 50%; | |||
} | |||
.v-ie6 .v-formlayout-cell .v-errorindicator { | |||
background-image: url(../common/icons/error-ie6.png); | |||
} | |||
.v-formlayout-captioncell { | |||
text-align: right; | |||
white-space: nowrap; | |||
@@ -42,10 +39,6 @@ | |||
margin-top: 5px; | |||
min-height: 20px; | |||
} | |||
.v-ie6 .v-form-errormessage { | |||
height: 20px; | |||
background-image: url(../common/icons/error-ie6.png); | |||
} | |||
.v-form fieldset { | |||
border: none; | |||
border-top: 1px solid #babfc0; |
@@ -36,9 +36,6 @@ | |||
background: #fff; | |||
min-height: 100%; | |||
} | |||
.v-ie6 .v-panel-content { | |||
background: #fff; | |||
} | |||
.blue .v-panel-deco { | |||
border-color: #92a3ac; | |||
background: #adc2cd; | |||
@@ -64,9 +61,6 @@ | |||
display: inline-block; | |||
vertical-align: middle; | |||
} | |||
.v-ie6 .v-panel-caption .v-errorindicator { | |||
background-image: url(../common/icons/error-ie6.png); | |||
} | |||
/* Light style */ | |||
.v-panel-light .v-panel-caption-light, | |||
@@ -79,9 +73,6 @@ | |||
.v-panel-content-light > div { | |||
background: transparent; | |||
} | |||
.v-ie6 .v-panel-content-light { | |||
background: transparent; | |||
} | |||
.v-panel-light .v-panel-deco-light { | |||
height: 0; | |||
border: none; |
@@ -4,9 +4,6 @@ | |||
background-image: url(img/left.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ | |||
padding-left: 2px; | |||
} | |||
.v-ie6 .v-filterselect { | |||
background-image: url(img/left-ie6.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ | |||
} | |||
.v-app .v-filterselect-input, | |||
.v-window .v-filterselect-input, | |||
.v-popupview-popup .v-filterselect-input { | |||
@@ -30,9 +27,6 @@ | |||
.v-filterselect-focus { | |||
background-image: url(img/left-focus.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ | |||
} | |||
.v-ie6 .v-filterselect-focus { | |||
background-image: url(img/left-focus-ie6.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ | |||
} | |||
.v-filterselect-focus .v-filterselect-input { | |||
background-image: url(img/center-focus.png); /** sprite-ref: verticals; sprite-alignment: repeat */ | |||
} | |||
@@ -209,9 +203,6 @@ | |||
.black .v-filterselect { | |||
background-image: url(img/black/left-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */ | |||
} | |||
.v-ie6 .black .v-filterselect { | |||
background-image: url(img/black/left-black-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */ | |||
} | |||
.v-app .black .v-filterselect-input, | |||
.v-window .black .v-filterselect-input, | |||
.v-window-black .v-filterselect-input, | |||
@@ -222,9 +213,6 @@ | |||
.black .v-filterselect-focus { | |||
background-image: url(img/black/left-black-focus.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */ | |||
} | |||
.v-ie6 .black .v-filterselect-focus { | |||
background-image: url(img/black/left-black-focus-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */ | |||
} | |||
.black .v-filterselect-focus .v-filterselect-input { | |||
background-image: url(img/black/center-black-focus.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */ | |||
} | |||
@@ -265,15 +253,3 @@ | |||
background: #151717; | |||
color: #c9ccce; | |||
} | |||
/* Twincolselect needs a little tweak in IE6 */ | |||
.v-ie6 .v-select-twincol-buttons .v-button { | |||
padding-left: 12px; | |||
padding-right: 12px; | |||
} | |||
/* IE6 needs some help identifying when the input is readonly */ | |||
.v-ie6 .v-filterselect.v-readonly, | |||
.v-ie6 .v-filterselect .v-filterselect-input-readonly { | |||
background: transparent; | |||
} |
@@ -25,19 +25,6 @@ | |||
line-height: normal; | |||
} | |||
.v-ie6 .v-table, | |||
.v-ie6 .v-table-header-wrap, | |||
.v-ie6 .v-table-footer-wrap, | |||
.v-ie6 .v-table-column-selector { | |||
/* The header will overflow the Table due to a bug in IE6 after changes in #3003. To fix this (#7314) | |||
* we need to apply position:relative to the wrappers and selector to make them appear on top of the | |||
* header. We also need to apply it to the table root div to get rid of a really weird IE6 rendering bug | |||
* caused by all this relativeness (see attachment in #7314). | |||
*/ | |||
position: relative; | |||
} | |||
.v-ie6 .v-table.v-disabled, | |||
.v-ie7 .v-table.v-disabled { | |||
/* Fixes ie issue #7324 where disabled shim does not cover table body */ | |||
position: relative; |
@@ -56,9 +56,6 @@ | |||
.v-ie7 .v-tabsheet-caption-close { | |||
margin-top: -17px; | |||
} | |||
.v-ie6 .v-tabsheet-caption-close { | |||
float: none; | |||
} | |||
.v-tabsheet-caption-close:hover { | |||
background-image: url(img/close-btn-hover.png); /** sprite-ref: verticals */ | |||
} | |||
@@ -155,9 +152,6 @@ | |||
.v-ff2 .v-tabsheet-tabs .v-errorindicator { | |||
display: -moz-inline-stack; | |||
} | |||
.v-ie6 .v-tabsheet-tabs .v-errorindicator { | |||
background-image: url(../common/icons/error-ie6.png); | |||
} | |||
.v-ie .v-tabsheet-tabs .v-errorindicator { | |||
zoom: 1; | |||
display: inline; |
@@ -71,14 +71,6 @@ textarea.v-textarea-prompt { | |||
margin-top: -2px; | |||
margin-bottom: -2px; | |||
} | |||
.v-ie6 .v-table-cell-wrapper input.v-textfield { | |||
margin-top: -2px; | |||
margin-bottom: -2px; | |||
} | |||
.v-ie6 .v-table-cell-wrapper div input.v-textfield { | |||
margin-top: 0; | |||
margin-bottom: 0; | |||
} | |||
/* Textfield on black background */ | |||
.black .v-textfield, | |||
.black .v-textarea { |
@@ -1,13 +1,6 @@ | |||
.v-tree-node { | |||
background: transparent url(img/arrows.png) no-repeat 6px -10px; | |||
} | |||
.v-ie6 .v-tree-node { | |||
background-image: url(img/arrows-ie6.png); | |||
background-repeat: no-repeat; | |||
} | |||
.v-ie6 div.v-tree-node-leaf { | |||
background: transparent; | |||
} | |||
.v-tree-node-expanded { | |||
background-position: -7px 5px; | |||
} | |||
@@ -32,12 +25,6 @@ | |||
.v-tree-node-children { | |||
padding-left: 16px; | |||
} | |||
/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */ | |||
.v-ie6 .v-tree-node-ie6compatnode { | |||
width: 14px; | |||
height: 10px; | |||
padding: 1px; | |||
} | |||
.v-tree-node-caption.v-tree-node-focused span{ | |||
padding-left: 1px; | |||
padding-top: 0px; | |||
@@ -46,9 +33,6 @@ | |||
.v-tree-node-focused span{ | |||
border: 1px dotted black; | |||
} | |||
.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{ | |||
padding-left: 0px; | |||
} | |||
/*************************************** | |||
* Drag'n'drop styles | |||
***************************************/ |
@@ -9,23 +9,19 @@ | |||
.v-op .v-window-wrap { | |||
border-color: rgba(0,0,0,.2); | |||
} | |||
.v-ff2 .v-window-wrap, | |||
.v-ie6 .v-window-wrap { | |||
.v-ff2 .v-window-wrap { | |||
border: none; | |||
} | |||
.v-ff2 .v-window-outerheader, | |||
.v-ie6 .v-window-outerheader { | |||
.v-ff2 .v-window-outerheader { | |||
border: 1px solid #808386; | |||
border-bottom: none; | |||
} | |||
.v-ff2 .v-window-contents, | |||
.v-ie6 .v-window-contents { | |||
.v-ff2 .v-window-contents { | |||
border: 1px solid #808386; | |||
border-top: none; | |||
border-bottom: none; | |||
} | |||
.v-ff2 .v-window-footer, | |||
.v-ie6 .v-window-footer { | |||
.v-ff2 .v-window-footer { | |||
border: 1px solid #808386; | |||
border-top: none; | |||
} | |||
@@ -50,9 +46,6 @@ | |||
padding-left: 13px; | |||
background: transparent url(../common/icons/error.png) no-repeat 0 50%; | |||
} | |||
.v-ie6 .v-window-error .v-window-header { | |||
background-image: url(../common/icons/error-ie6.png); | |||
} | |||
.v-window-resizebox { | |||
width: 15px; | |||
height: 15px; | |||
@@ -136,12 +129,6 @@ | |||
background: #f7f7f8 repeat-x; | |||
background-image: url(img/content-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */ | |||
} | |||
.v-ie6 .v-window-light .v-window-wrap2 { | |||
background-image: none; | |||
} | |||
/** | |||
@@ -203,12 +190,6 @@ | |||
width: 14px; | |||
height: 14px; | |||
} | |||
.v-ie6 .v-window-black .v-window-resizebox { | |||
background-image: url(img/black/resize-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 4px */ | |||
} | |||
.v-ie6 .v-window-black .v-window-contents { | |||
background: transparent url(img/black/content-bg-ie6.png) repeat-x; | |||
} | |||
/* Must be last to make this image last in the sprites */ | |||
.v-window-black .v-window-contents { | |||
border: none; |
@@ -160,13 +160,9 @@ | |||
.v-checkbox .v-errorindicator { | |||
padding-left: 10px; | |||
} | |||
.v-ie6 .v-checkbox .v-errorindicator { | |||
padding-right: 4px; | |||
} | |||
.v-ie7 .v-checkbox .v-errorindicator { | |||
padding-right: 7px; | |||
} | |||
.v-ie6 .v-button .v-errorindicator, | |||
.v-ie7 .v-button .v-errorindicator { | |||
padding-right: 5px; | |||
} |
@@ -6,10 +6,6 @@ | |||
height: 16px; | |||
background: transparent url(../icons/16/error.png) no-repeat top right; | |||
} | |||
.v-ie6 .v-errorindicator { | |||
/* gif for transparency */ | |||
background-image: url(../icons/16/error.gif); | |||
} | |||
.v-ie7 .v-errorindicator { | |||
margin-left: -3px; | |||
} |
@@ -36,9 +36,6 @@ | |||
margin-top: 5px; | |||
min-height: 20px; | |||
} | |||
.v-ie6 .v-form-errormessage { | |||
height: 20px | |||
} | |||
.v-form fieldset { | |||
border: none; | |||
border-top: 1px solid #babfc0; |
@@ -67,37 +67,14 @@ | |||
overflow: hidden; | |||
} | |||
/* IE specific rules */ | |||
.v-ie6 .v-panel { | |||
background: transparent; | |||
} | |||
.v-ie6 .v-panel-caption { | |||
border: 1px solid #babfc0; | |||
border-bottom: none; | |||
background: #fff; | |||
margin: 0; | |||
padding-left: 18px | |||
} | |||
.v-ie6 .v-panel-nocaption { | |||
border: none; | |||
background: transparent; | |||
margin: 0; | |||
height: 0; | |||
} | |||
.v-ie6 .v-panel-caption-light { | |||
border: none; | |||
background: transparent; | |||
} | |||
.v-ie6 .v-panel-content, | |||
.v-ie7 .v-panel-content, | |||
.v-ie8 .v-panel-content { | |||
border-bottom: 1px solid #babfc0; | |||
} | |||
.v-ie6 .v-panel-content-light, | |||
.v-ie7 .v-panel-content-light, | |||
.v-ie8 .v-panel-content-light { | |||
border-bottom: none; | |||
} | |||
.v-ie6 .v-panel-deco, | |||
.v-ie7 .v-panel-deco, | |||
.v-ie8 .v-panel-deco { | |||
height: 0; |
@@ -127,12 +127,6 @@ | |||
border-top: 1px solid #b6bbbc; | |||
} | |||
/* IE6 needs some help identifying when the input is readonly */ | |||
.v-ie6 .v-filterselect.v-readonly, | |||
.v-ie6 .v-filterselect .v-filterselect-input-readonly { | |||
background: transparent; | |||
} | |||
/* Error styles (disabled by default) | |||
---------------------------------- |
@@ -68,16 +68,3 @@ | |||
background-color: #FFE0E0; | |||
} | |||
*/ | |||
/* IE specific styles */ | |||
.v-ie6 .v-slider, | |||
.v-ie6 .v-slider-vertical { | |||
margin: 0; | |||
} | |||
.v-ie6 .v-slider .v-slider-handle { | |||
margin: -1px 0; | |||
} | |||
.v-ie6 .v-slider-vertical .v-slider-handle { | |||
margin: 0 -1px; | |||
} |
@@ -36,23 +36,6 @@ | |||
margin: -1px 0; | |||
} | |||
/* IE6 specific styles */ | |||
.v-ie6 .v-splitpanel-hsplitter div, | |||
.v-ie6 .v-splitpanel-hsplitter-locked div { | |||
height: 99%; | |||
} | |||
.v-ie6 .v-splitpanel-vsplitter, | |||
.v-ie6 .v-splitpanel-vsplitter-locked { | |||
height: 8px; | |||
} | |||
.v-ie6 .v-splitpanel-vsplitter div, | |||
.v-ie6 .v-splitpanel-vsplitter-locked div { | |||
margin: 0; | |||
} | |||
/* Rounded style */ | |||
.v-splitpanel-hsplitter-rounded div, | |||
@@ -72,10 +55,6 @@ | |||
.v-splitpanel-vsplitter-rounded-locked div { | |||
margin: -1px 4px; | |||
} | |||
.v-ie6 .v-splitpanel-hsplitter-rounded div, | |||
.v-ie6 .v-splitpanel-hsplitter-rounded-locked div { | |||
height: 97%; | |||
} | |||
/* Small style */ |
@@ -158,20 +158,6 @@ tr.v-table-row-odd:hover { | |||
.v-table .v-link { | |||
display: inline; | |||
} | |||
/* IE6 hack */ | |||
.v-ie6 .v-table-scrollposition { | |||
background: transparent; | |||
/* | |||
AlphaImageLoader uses src attribute relative to host page, not CSS | |||
We need multiple different filters because we cannot be sure how host page is served compared to theme resources | |||
TODO: This actually does not work as expected, since only the last filter is applied. Can we chain filters together (i.e. contain all versions on one line)? | |||
*/ | |||
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../../VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); | |||
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); | |||
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); | |||
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); | |||
} | |||
/* Borderless style */ | |||
.v-table-borderless .v-table-header-wrap, |
@@ -132,24 +132,6 @@ | |||
padding-top: 12px; | |||
}*/ | |||
/* IE specific styles */ | |||
.v-ie6 .v-tabsheet-tabs { | |||
height: 46px; | |||
} | |||
.v-ie6 .v-tabsheet-tabitem-selected { | |||
border: 1px solid #babfc0; | |||
border-bottom: none; | |||
background: #fff; | |||
margin-top: 0; | |||
height: 23px; | |||
padding: 18px 14px 6px 15px; | |||
cursor: default; | |||
color: #ee5311; | |||
} | |||
.v-ie6 .v-tabsheet-tabitem-selected .v-caption { | |||
background: transparent; | |||
padding: 0; | |||
margin: 0; | |||
} | |||
.v-ie .v-tabsheet-content { | |||
border-bottom: none; | |||
} | |||
@@ -268,18 +250,15 @@ | |||
padding-left: 3px; | |||
}*/ | |||
/* IE specific styles */ | |||
.v-ie6 .v-tabsheet-tabs-light, | |||
.v-ie7 .v-tabsheet-tabs-light { | |||
height: 32px; | |||
} | |||
.v-ie6 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected, | |||
.v-ie7 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected { | |||
border: none; | |||
background: #fff url(img/inline-tab-right.png) no-repeat right top; | |||
padding: 0; | |||
height: 32px; | |||
} | |||
.v-ie6 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected .v-caption, | |||
.v-ie7 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected .v-caption { | |||
background: transparent url(img/inline-tab-left.png) no-repeat -7px 0; | |||
padding: 9px 11px 0 11px; |
@@ -30,12 +30,6 @@ | |||
.v-tree-node-children { | |||
padding-left: 16px; | |||
} | |||
/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */ | |||
.v-ie6 .v-tree-node-ie6compatnode { | |||
width: 14px; | |||
height: 10px; | |||
padding: 1px; | |||
} | |||
.v-tree{ | |||
outline:none; | |||
} | |||
@@ -47,9 +41,6 @@ | |||
.v-tree-node-focused span{ | |||
border: 1px dotted black; | |||
} | |||
.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{ | |||
padding-left: 0px; | |||
} | |||
/*************************************** | |||
* Drag'n'drop styles | |||
***************************************/ |
@@ -21,7 +21,6 @@ | |||
letter-spacing: -0.03em; | |||
color: #f14c1a; | |||
text-shadow: 0 1px 0 #fff; | |||
/* This element is 100% wide in IE6 */ | |||
} | |||
.v-window-contents { | |||
background: #fff; |
@@ -224,9 +224,8 @@ public class CompileDefaultTheme { | |||
private static void createSprites(String themeName) | |||
throws FileNotFoundException, IOException { | |||
String[] parameters = new String[] { "--sprite-png-depth", "AUTO", | |||
"--sprite-png-ie6", "--css-file-suffix", "-sprite", | |||
"--css-file-encoding", "UTF-8", "--root-dir-path", | |||
THEME_DIR + themeName, "--log-level", "WARN" }; | |||
"--css-file-suffix", "-sprite", "--css-file-encoding", "UTF-8", | |||
"--root-dir-path", THEME_DIR + themeName, "--log-level", "WARN" }; | |||
org.carrot2.labs.smartsprites.SmartSprites.main(parameters); | |||
@@ -18,7 +18,7 @@ | |||
<when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" /> | |||
</replace-with> | |||
<!-- Use our own history impl for IE to workaround #2931. --> | |||
<!-- Use our own history impl for IE7 to workaround #2931. --> | |||
<replace-with class="com.vaadin.terminal.gwt.client.HistoryImplIEVaadin"> | |||
<when-type-is class="com.google.gwt.user.client.impl.HistoryImpl" /> | |||
<when-property-is name="user.agent" value="ie6" /> |
@@ -443,10 +443,6 @@ public class ApplicationConfiguration implements EntryPoint { | |||
public void onModuleLoad() { | |||
// Enable IE6 Background image caching | |||
if (BrowserInfo.get().isIE6()) { | |||
enableIE6BackgroundImageCache(); | |||
} | |||
// Prepare VConsole for debugging | |||
if (isDebugMode()) { | |||
VDebugConsole console = GWT.create(VDebugConsole.class); | |||
@@ -476,19 +472,6 @@ public class ApplicationConfiguration implements EntryPoint { | |||
startNextApplication(); | |||
} | |||
// From ImageSrcIE6 | |||
private static native void enableIE6BackgroundImageCache() | |||
/*-{ | |||
// Fix IE background image refresh bug, present through IE6 | |||
// see http://www.mister-pixel.com/#Content__state=is_that_simple | |||
// this only works with IE6 SP1+ | |||
try { | |||
$doc.execCommand("BackgroundImageCache", false, true); | |||
} catch (e) { | |||
// ignore error on other browsers | |||
} | |||
}-*/; | |||
/** | |||
* Checks if client side is in debug mode. Practically this is invoked by | |||
* adding ?debug parameter to URI. |
@@ -2332,19 +2332,6 @@ public class ApplicationConnection { | |||
} | |||
/** | |||
* Adds PNG-fix conditionally (only for IE6) to the specified IMG -element. | |||
* | |||
* @param el | |||
* the IMG element to fix | |||
*/ | |||
public void addPngFix(Element el) { | |||
BrowserInfo b = BrowserInfo.get(); | |||
if (b.isIE6()) { | |||
Util.addPngFix(el); | |||
} | |||
} | |||
/* | |||
* Helper to run layout functions triggered by child components with a | |||
* decent interval. |
@@ -192,10 +192,6 @@ public class BrowserInfo { | |||
return isSafari() && browserDetails.getBrowserMajorVersion() == 4; | |||
} | |||
public boolean isIE6() { | |||
return isIE() && browserDetails.getBrowserMajorVersion() == 6; | |||
} | |||
public boolean isIE7() { | |||
return isIE() && browserDetails.getBrowserMajorVersion() == 7; | |||
} |
@@ -11,7 +11,6 @@ import java.util.Iterator; | |||
import java.util.Map; | |||
import java.util.Set; | |||
import com.google.gwt.core.client.GWT; | |||
import com.google.gwt.core.client.Scheduler; | |||
import com.google.gwt.core.client.Scheduler.ScheduledCommand; | |||
import com.google.gwt.dom.client.DivElement; | |||
@@ -208,18 +207,6 @@ public class Util { | |||
return BrowserInfo.get().isIE(); | |||
} | |||
/** | |||
* Detects if current browser is IE6. | |||
* | |||
* @deprecated use BrowserInfo class instead | |||
* | |||
* @return true if IE6 | |||
*/ | |||
@Deprecated | |||
public static boolean isIE6() { | |||
return BrowserInfo.get().isIE6(); | |||
} | |||
/** | |||
* @deprecated use BrowserInfo class instead | |||
* @return | |||
@@ -250,7 +237,7 @@ public class Util { | |||
DOM.setInnerText(escapeHtmlHelper, html); | |||
String escapedText = DOM.getInnerHTML(escapeHtmlHelper); | |||
if (BrowserInfo.get().isIE() && BrowserInfo.get().getIEVersion() < 9) { | |||
// #7478 IE6-IE8 "incorrectly" returns "<br>" for newlines set using | |||
// #7478 IE7-IE8 "incorrectly" returns "<br>" for newlines set using | |||
// setInnerText. The same for " " which is converted to " " | |||
escapedText = escapedText.replaceAll("<(BR|br)>", "\n"); | |||
escapedText = escapedText.replaceAll(" ", " "); | |||
@@ -274,48 +261,6 @@ public class Util { | |||
return attribute; | |||
} | |||
/** | |||
* Adds transparent PNG fix to image element; only use for IE6. | |||
* | |||
* @param el | |||
* IMG element | |||
*/ | |||
public native static void addPngFix(Element el) | |||
/*-{ | |||
el.attachEvent("onload", function() { | |||
@com.vaadin.terminal.gwt.client.Util::doIE6PngFix(Lcom/google/gwt/user/client/Element;)(el); | |||
},false); | |||
}-*/; | |||
private native static void doPngFix(Element el, String blankImageUrl) | |||
/*-{ | |||
var src = el.src; | |||
if (src.indexOf(".png") < 1) return; | |||
var w = el.width || 16; | |||
var h = el.height || 16; | |||
if(h==30 || w==28) { | |||
setTimeout(function(){ | |||
el.style.height = el.height + "px"; | |||
el.style.width = el.width + "px"; | |||
el.src = blankImageUrl; | |||
},10); | |||
} else { | |||
el.src = blankImageUrl; | |||
el.style.height = h + "px"; | |||
el.style.width = w + "px"; | |||
} | |||
el.style.padding = "0"; | |||
el.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+src+"', sizingMethod='crop')"; | |||
}-*/; | |||
public static void doIE6PngFix(Element el) { | |||
String blankImageUrl = GWT.getModuleBaseURL() + "ie6pngfix/blank.gif"; | |||
String src = el.getAttribute("src"); | |||
if (src != null && !src.equals(blankImageUrl)) { | |||
doPngFix(el, blankImageUrl); | |||
} | |||
} | |||
/** | |||
* Clones given element as in JavaScript. | |||
* | |||
@@ -334,11 +279,7 @@ public class Util { | |||
public static int measureHorizontalPaddingAndBorder(Element element, | |||
int paddingGuess) { | |||
String originalWidth = DOM.getStyleAttribute(element, "width"); | |||
String originalOverflow = ""; | |||
if (BrowserInfo.get().isIE6()) { | |||
originalOverflow = DOM.getStyleAttribute(element, "overflow"); | |||
DOM.setStyleAttribute(element, "overflow", "hidden"); | |||
} | |||
int originalOffsetWidth = element.getOffsetWidth(); | |||
int widthGuess = (originalOffsetWidth - paddingGuess); | |||
if (widthGuess < 1) { | |||
@@ -348,9 +289,7 @@ public class Util { | |||
int padding = element.getOffsetWidth() - widthGuess; | |||
DOM.setStyleAttribute(element, "width", originalWidth); | |||
if (BrowserInfo.get().isIE6()) { | |||
DOM.setStyleAttribute(element, "overflow", originalOverflow); | |||
} | |||
return padding; | |||
} | |||
@@ -412,7 +351,6 @@ public class Util { | |||
int offsetWidth = element.getOffsetWidth(); | |||
int offsetHeight = element.getOffsetHeight(); | |||
// if (BrowserInfo.get().isIE6()) { | |||
if (offsetHeight < 1) { | |||
offsetHeight = 1; | |||
} | |||
@@ -420,7 +358,6 @@ public class Util { | |||
offsetWidth = 10; | |||
} | |||
element.getStyle().setPropertyPx("width", offsetWidth); | |||
// } | |||
element.getStyle().setPropertyPx("height", offsetHeight); | |||
@@ -428,9 +365,7 @@ public class Util { | |||
- element.getPropertyInt("clientHeight"); | |||
element.getStyle().setProperty("height", height); | |||
// if (BrowserInfo.get().isIE6()) { | |||
element.getStyle().setProperty("width", width); | |||
// } | |||
} else { | |||
borders = element.getOffsetHeight() | |||
- element.getPropertyInt("clientHeight"); |
@@ -29,7 +29,6 @@ public class VCaption extends HTML { | |||
private final ApplicationConnection client; | |||
private boolean placedAfterComponent = false; | |||
private boolean iconOnloadHandled = false; | |||
private int maxWidth = -1; | |||
@@ -112,7 +111,6 @@ public class VCaption extends HTML { | |||
// Icon forces the caption to be above the component | |||
placedAfterComponent = false; | |||
iconOnloadHandled = false; | |||
icon.setUri(uidl.getStringAttribute(ATTRIBUTE_ICON)); | |||
} else if (icon != null) { | |||
@@ -246,16 +244,10 @@ public class VCaption extends HTML { | |||
} | |||
if (DOM.eventGetType(event) == Event.ONLOAD | |||
&& icon.getElement() == target && !iconOnloadHandled) { | |||
&& icon.getElement() == target) { | |||
icon.setWidth(""); | |||
icon.setHeight(""); | |||
/* | |||
* IE6 pngFix causes two onload events to be fired and we want to | |||
* react only to the first one | |||
*/ | |||
iconOnloadHandled = true; | |||
// if max width defined, recalculate | |||
if (maxWidth != -1) { | |||
setMaxWidth(maxWidth); |
@@ -13,11 +13,9 @@ import com.google.gwt.user.client.Element; | |||
import com.google.gwt.user.client.Event; | |||
import com.google.gwt.user.client.ui.Widget; | |||
import com.google.gwt.user.client.ui.impl.FocusImpl; | |||
import com.vaadin.terminal.gwt.client.BrowserInfo; | |||
/** | |||
* A panel that contains an always visible 0x0 size element that holds the focus | |||
* for all browsers but IE6. | |||
*/ | |||
public class FocusElementPanel extends SimpleFocusablePanel { | |||
@@ -30,22 +28,20 @@ public class FocusElementPanel extends SimpleFocusablePanel { | |||
@Override | |||
public void setWidget(Widget w) { | |||
super.setWidget(w); | |||
if (!BrowserInfo.get().isIE6()) { | |||
if (focusElement.getParentElement() == null) { | |||
Style style = focusElement.getStyle(); | |||
style.setPosition(Position.FIXED); | |||
style.setTop(0, Unit.PX); | |||
style.setLeft(0, Unit.PX); | |||
getElement().appendChild(focusElement); | |||
/* Sink from focusElement too as focus and blur don't bubble */ | |||
DOM.sinkEvents( | |||
(com.google.gwt.user.client.Element) focusElement | |||
.cast(), Event.FOCUSEVENTS); | |||
// revert to original, not focusable | |||
getElement().setPropertyObject("tabIndex", null); | |||
} else { | |||
moveFocusElementAfterWidget(); | |||
} | |||
if (focusElement.getParentElement() == null) { | |||
Style style = focusElement.getStyle(); | |||
style.setPosition(Position.FIXED); | |||
style.setTop(0, Unit.PX); | |||
style.setLeft(0, Unit.PX); | |||
getElement().appendChild(focusElement); | |||
/* Sink from focusElement too as focus and blur don't bubble */ | |||
DOM.sinkEvents( | |||
(com.google.gwt.user.client.Element) focusElement.cast(), | |||
Event.FOCUSEVENTS); | |||
// revert to original, not focusable | |||
getElement().setPropertyObject("tabIndex", null); | |||
} else { | |||
moveFocusElementAfterWidget(); | |||
} | |||
} | |||
@@ -58,28 +54,20 @@ public class FocusElementPanel extends SimpleFocusablePanel { | |||
@Override | |||
public void setFocus(boolean focus) { | |||
if (BrowserInfo.get().isIE6()) { | |||
super.setFocus(focus); | |||
if (focus) { | |||
FocusImpl.getFocusImplForPanel().focus( | |||
(Element) focusElement.cast()); | |||
} else { | |||
if (focus) { | |||
FocusImpl.getFocusImplForPanel().focus( | |||
(Element) focusElement.cast()); | |||
} else { | |||
FocusImpl.getFocusImplForPanel().blur( | |||
(Element) focusElement.cast()); | |||
} | |||
FocusImpl.getFocusImplForPanel() | |||
.blur((Element) focusElement.cast()); | |||
} | |||
} | |||
@Override | |||
public void setTabIndex(int tabIndex) { | |||
if (BrowserInfo.get().isIE6()) { | |||
super.setTabIndex(tabIndex); | |||
} else { | |||
getElement().setTabIndex(-1); | |||
if (focusElement != null) { | |||
focusElement.setTabIndex(tabIndex); | |||
} | |||
getElement().setTabIndex(-1); | |||
if (focusElement != null) { | |||
focusElement.setTabIndex(tabIndex); | |||
} | |||
} | |||
@@ -21,7 +21,6 @@ import com.google.gwt.user.client.Event; | |||
import com.google.gwt.user.client.ui.ScrollPanel; | |||
import com.google.gwt.user.client.ui.Widget; | |||
import com.google.gwt.user.client.ui.impl.FocusImpl; | |||
import com.vaadin.terminal.gwt.client.BrowserInfo; | |||
/** | |||
* A scrollhandlers similar to {@link ScrollPanel}. | |||
@@ -57,18 +56,9 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements | |||
if (useFakeFocusElement()) { | |||
if (focusElement.getParentElement() == null) { | |||
Style style = focusElement.getStyle(); | |||
if (BrowserInfo.get().isIE6()) { | |||
style.setOverflow(Overflow.HIDDEN); | |||
style.setHeight(0, Unit.PX); | |||
style.setWidth(0, Unit.PX); | |||
style.setPosition(Position.ABSOLUTE); | |||
addScrollHandler(this); | |||
} else { | |||
style.setPosition(Position.FIXED); | |||
style.setTop(0, Unit.PX); | |||
style.setLeft(0, Unit.PX); | |||
} | |||
style.setPosition(Position.FIXED); | |||
style.setTop(0, Unit.PX); | |||
style.setLeft(0, Unit.PX); | |||
getElement().appendChild(focusElement); | |||
/* Sink from focusElemet too as focusa and blur don't bubble */ | |||
DOM.sinkEvents( |
@@ -19,7 +19,6 @@ public class Icon extends UIObject { | |||
DOM.setElementProperty(getElement(), "alt", ""); | |||
setStyleName(CLASSNAME); | |||
this.client = client; | |||
client.addPngFix(getElement()); | |||
} | |||
public Icon(ApplicationConnection client, String uidlUri) { |
@@ -22,7 +22,6 @@ import com.google.gwt.user.client.ui.ComplexPanel; | |||
import com.google.gwt.user.client.ui.SimplePanel; | |||
import com.google.gwt.user.client.ui.Widget; | |||
import com.vaadin.terminal.gwt.client.ApplicationConnection; | |||
import com.vaadin.terminal.gwt.client.BrowserInfo; | |||
import com.vaadin.terminal.gwt.client.Container; | |||
import com.vaadin.terminal.gwt.client.EventId; | |||
import com.vaadin.terminal.gwt.client.Paintable; | |||
@@ -30,7 +29,6 @@ import com.vaadin.terminal.gwt.client.RenderSpace; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
import com.vaadin.terminal.gwt.client.Util; | |||
import com.vaadin.terminal.gwt.client.VCaption; | |||
import com.vaadin.terminal.gwt.client.VConsole; | |||
public class VAbsoluteLayout extends ComplexPanel implements Container { | |||
@@ -211,9 +209,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { | |||
canvas.getStyle().setProperty("width", width); | |||
if (!rendering) { | |||
if (BrowserInfo.get().isIE6()) { | |||
relayoutWrappersForIe6(); | |||
} | |||
relayoutRelativeChildren(); | |||
} | |||
} | |||
@@ -236,21 +231,10 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { | |||
canvas.getStyle().setProperty("height", height); | |||
if (!rendering) { | |||
if (BrowserInfo.get().isIE6()) { | |||
relayoutWrappersForIe6(); | |||
} | |||
relayoutRelativeChildren(); | |||
} | |||
} | |||
private void relayoutWrappersForIe6() { | |||
for (Widget wrapper : getChildren()) { | |||
if (wrapper instanceof AbsoluteWrapper) { | |||
((AbsoluteWrapper) wrapper).ie6Layout(); | |||
} | |||
} | |||
} | |||
public class AbsoluteWrapper extends SimplePanel { | |||
private String css; | |||
private String left; | |||
@@ -353,9 +337,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { | |||
style.setProperty("right", right); | |||
style.setProperty("bottom", bottom); | |||
if (BrowserInfo.get().isIE6()) { | |||
ie6Layout(); | |||
} | |||
} | |||
updateCaptionPosition(); | |||
} | |||
@@ -369,60 +350,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { | |||
- caption.getHeight()); | |||
} | |||
} | |||
private void ie6Layout() { | |||
// special handling for IE6 is needed, it does not support | |||
// setting both left/right or top/bottom | |||
Style style = getElement().getStyle(); | |||
if (bottom != null && top != null) { | |||
// define height for wrapper to simulate bottom property | |||
int bottompixels = measureForIE6(bottom, true); | |||
VConsole.log("ALB" + bottompixels); | |||
int height = canvas.getOffsetHeight() - bottompixels | |||
- getElement().getOffsetTop(); | |||
VConsole.log("ALB" + height); | |||
if (height < 0) { | |||
height = 0; | |||
} | |||
style.setPropertyPx("height", height); | |||
} else { | |||
// reset possibly existing value | |||
style.setProperty("height", ""); | |||
} | |||
if (left != null && right != null) { | |||
// define width for wrapper to simulate right property | |||
int rightPixels = measureForIE6(right, false); | |||
VConsole.log("ALR" + rightPixels); | |||
int width = canvas.getOffsetWidth() - rightPixels | |||
- getElement().getOffsetLeft(); | |||
VConsole.log("ALR" + width); | |||
if (width < 0) { | |||
width = 0; | |||
} | |||
style.setPropertyPx("width", width); | |||
} else { | |||
// reset possibly existing value | |||
style.setProperty("width", ""); | |||
} | |||
} | |||
} | |||
private Element measureElement; | |||
private int measureForIE6(String cssLength, boolean vertical) { | |||
if (measureElement == null) { | |||
measureElement = DOM.createDiv(); | |||
measureElement.getStyle().setProperty("position", "absolute"); | |||
canvas.appendChild(measureElement); | |||
} | |||
if (vertical) { | |||
measureElement.getStyle().setProperty("height", cssLength); | |||
return measureElement.getOffsetHeight(); | |||
} else { | |||
measureElement.getStyle().setProperty("width", cssLength); | |||
return measureElement.getOffsetWidth(); | |||
} | |||
} | |||
/** |
@@ -16,7 +16,6 @@ import com.google.gwt.user.client.Event; | |||
import com.google.gwt.user.client.ui.ComplexPanel; | |||
import com.google.gwt.user.client.ui.Widget; | |||
import com.vaadin.terminal.gwt.client.ApplicationConnection; | |||
import com.vaadin.terminal.gwt.client.BrowserInfo; | |||
import com.vaadin.terminal.gwt.client.ContainerResizedListener; | |||
import com.vaadin.terminal.gwt.client.Paintable; | |||
import com.vaadin.terminal.gwt.client.RenderInformation; | |||
@@ -50,10 +49,6 @@ public class VAccordion extends VTabsheetBase implements | |||
public VAccordion() { | |||
super(CLASSNAME); | |||
// IE6 needs this to calculate offsetHeight correctly | |||
if (BrowserInfo.get().isIE6()) { | |||
DOM.setStyleAttribute(getElement(), "zoom", "1"); | |||
} | |||
} | |||
@Override | |||
@@ -434,10 +429,6 @@ public class VAccordion extends VTabsheetBase implements | |||
setElement(DOM.createDiv()); | |||
caption = new VCaption(null, client); | |||
caption.addClickHandler(this); | |||
if (BrowserInfo.get().isIE6()) { | |||
DOM.setEventListener(captionNode, this); | |||
DOM.sinkEvents(captionNode, Event.BUTTON_LEFT); | |||
} | |||
super.add(caption, captionNode); | |||
DOM.appendChild(captionNode, caption.getElement()); | |||
DOM.appendChild(getElement(), captionNode); | |||
@@ -496,10 +487,6 @@ public class VAccordion extends VTabsheetBase implements | |||
removeStyleDependentName("open"); | |||
setHeight(-1); | |||
setWidth(""); | |||
if (BrowserInfo.get().isIE6()) { | |||
// Work around for IE6 layouting problem #3359 | |||
getElement().getStyle().setProperty("zoom", "1"); | |||
} | |||
open = false; | |||
} | |||
@@ -143,8 +143,8 @@ public class VButton extends FocusWidget implements Paintable, ClickHandler, | |||
} | |||
wrapper.insertBefore(errorIndicatorElement, captionElement); | |||
// Fix for IE6, IE7 | |||
if (BrowserInfo.get().isIE6() || BrowserInfo.get().isIE7()) { | |||
// Fix for IE7 | |||
if (BrowserInfo.get().isIE7()) { | |||
errorIndicatorElement.setInnerText(" "); | |||
} | |||
@@ -453,7 +453,7 @@ public class VButton extends FocusWidget implements Paintable, ClickHandler, | |||
@Override | |||
public void setWidth(String width) { | |||
if (BrowserInfo.get().isIE6() || BrowserInfo.get().isIE7()) { | |||
if (BrowserInfo.get().isIE7()) { | |||
if (width != null && width.length() > 2) { | |||
// Assume pixel values are always sent from | |||
// ApplicationConnection |
@@ -31,7 +31,6 @@ import com.google.gwt.user.client.ui.MenuBar; | |||
import com.google.gwt.user.client.ui.MenuItem; | |||
import com.google.gwt.user.client.ui.PopupPanel; | |||
import com.google.gwt.user.client.ui.impl.FocusImpl; | |||
import com.vaadin.terminal.gwt.client.BrowserInfo; | |||
import com.vaadin.terminal.gwt.client.Focusable; | |||
import com.vaadin.terminal.gwt.client.Util; | |||
@@ -218,11 +217,6 @@ public class VContextMenu extends VOverlay implements SubPartAware { | |||
public void onLoad(LoadEvent event) { | |||
// Handle icon onload events to ensure shadow is resized correctly | |||
if (BrowserInfo.get().isIE6()) { | |||
// Ensure PNG transparency works in IE6 | |||
Util.doIE6PngFix((Element) Element.as(event.getNativeEvent() | |||
.getEventTarget())); | |||
} | |||
delayedImageLoadExecutioner.trigger(); | |||
} | |||
@@ -87,7 +87,6 @@ public class VEmbedded extends HTML implements Paintable { | |||
setHTML(""); | |||
el = DOM.createImg(); | |||
created = true; | |||
client.addPngFix(el); | |||
DOM.sinkEvents(el, Event.ONLOAD); | |||
} | |||
@@ -12,7 +12,6 @@ import java.util.List; | |||
import com.google.gwt.core.client.Scheduler; | |||
import com.google.gwt.core.client.Scheduler.ScheduledCommand; | |||
import com.google.gwt.dom.client.Style.Overflow; | |||
import com.google.gwt.event.dom.client.BlurEvent; | |||
import com.google.gwt.event.dom.client.BlurHandler; | |||
import com.google.gwt.event.dom.client.ClickEvent; | |||
@@ -726,12 +725,6 @@ public class VFilterSelect extends Composite implements Paintable, Field, | |||
} | |||
public void onLoad(LoadEvent event) { | |||
if (BrowserInfo.get().isIE6()) { | |||
// Ensure PNG transparency works in IE6 | |||
Util.doIE6PngFix((Element) Element.as(event.getNativeEvent() | |||
.getEventTarget())); | |||
} | |||
// Handle icon onload events to ensure shadow is resized | |||
// correctly | |||
delayedImageLoadExecutioner.trigger(); | |||
@@ -1315,13 +1308,7 @@ public class VFilterSelect extends Composite implements Paintable, Field, | |||
private void updateSelectedIconPosition() { | |||
// Position icon vertically to middle | |||
int availableHeight = 0; | |||
if (BrowserInfo.get().isIE6()) { | |||
getElement().getStyle().setOverflow(Overflow.HIDDEN); | |||
availableHeight = getOffsetHeight(); | |||
getElement().getStyle().setProperty("overflow", ""); | |||
} else { | |||
availableHeight = getOffsetHeight(); | |||
} | |||
availableHeight = getOffsetHeight(); | |||
int iconHeight = Util.getRequiredHeight(selectedItemIcon); | |||
int marginTop = (availableHeight - iconHeight) / 2; | |||
@@ -1664,16 +1651,8 @@ public class VFilterSelect extends Composite implements Paintable, Field, | |||
this.width = width; | |||
} | |||
if (BrowserInfo.get().isIE6()) { | |||
// Required in IE when textfield is wider than this.width | |||
getElement().getStyle().setOverflow(Overflow.HIDDEN); | |||
horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder( | |||
this, width, horizPaddingAndBorder); | |||
getElement().getStyle().setProperty("overflow", ""); | |||
} else { | |||
horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder( | |||
this, width, horizPaddingAndBorder); | |||
} | |||
horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder(this, | |||
width, horizPaddingAndBorder); | |||
if (initDone) { | |||
updateRootWidth(); | |||
@@ -1763,16 +1742,7 @@ public class VFilterSelect extends Composite implements Paintable, Field, | |||
* @return The width in pixels | |||
*/ | |||
private int getMainWidth() { | |||
int componentWidth; | |||
if (BrowserInfo.get().isIE6()) { | |||
// Required in IE when textfield is wider than this.width | |||
getElement().getStyle().setOverflow(Overflow.HIDDEN); | |||
componentWidth = getOffsetWidth(); | |||
getElement().getStyle().setProperty("overflow", ""); | |||
} else { | |||
componentWidth = getOffsetWidth(); | |||
} | |||
return componentWidth; | |||
return getOffsetWidth(); | |||
} | |||
/** |
@@ -16,7 +16,6 @@ import com.google.gwt.user.client.Event; | |||
import com.google.gwt.user.client.ui.ComplexPanel; | |||
import com.google.gwt.user.client.ui.Widget; | |||
import com.vaadin.terminal.gwt.client.ApplicationConnection; | |||
import com.vaadin.terminal.gwt.client.BrowserInfo; | |||
import com.vaadin.terminal.gwt.client.Container; | |||
import com.vaadin.terminal.gwt.client.Paintable; | |||
import com.vaadin.terminal.gwt.client.RenderInformation; | |||
@@ -214,9 +213,6 @@ public class VForm extends ComplexPanel implements Container, KeyDownHandler { | |||
renderInformation.setContentAreaHeight(renderInformation | |||
.getRenderedSize().getHeight() - getSpaceConsumedVertically()); | |||
if (BrowserInfo.get().isIE6()) { | |||
getElement().getStyle().setProperty("overflow", "hidden"); | |||
} | |||
renderInformation.setContentAreaWidth(renderInformation | |||
.getRenderedSize().getWidth() - borderPaddingHorizontal); | |||
} |