diff options
Diffstat (limited to 'WebContent/VAADIN/themes/base')
29 files changed, 121 insertions, 235 deletions
diff --git a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css index b2c2ed2858..4373c52922 100644 --- a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css +++ b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css @@ -1,4 +1,15 @@ .v-absolutelayout-wrapper { position: absolute; overflow: hidden; -}
\ No newline at end of file +} +.v-absolutelayout-margin, .v-absolutelayout-canvas { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.v-absolutelayout.v-has-height > div, .v-absolutelayout.v-has-height > div > div { + height: 100%; +} +.v-absolutelayout.v-has-width > div, .v-absolutelayout.v-has-width > div > div { + width: 100%; +} diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css index 48d30d4576..2e14d59a90 100644 --- a/WebContent/VAADIN/themes/base/button/button.css +++ b/WebContent/VAADIN/themes/base/button/button.css @@ -29,14 +29,6 @@ cursor: default; } -.v-ie6 .v-button { - display: inline; -} - -.v-ie7 .v-button { - display: inline; -} - .v-button-wrap, .v-button-caption { vertical-align: middle; @@ -117,10 +109,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,12 +136,6 @@ white-space: nowrap; } -/* Fix for IE6/IE7 issue where checkbox moves 1 pixel down after selection (#4636) */ -.v-ie6 .v-checkbox, -.v-ie7 .v-checkbox { - vertical-align: baseline; -} - .v-checkbox .v-icon { margin: 0 2px; } diff --git a/WebContent/VAADIN/themes/base/caption/caption.css b/WebContent/VAADIN/themes/base/caption/caption.css index bdeaae3de2..364b68a226 100644 --- a/WebContent/VAADIN/themes/base/caption/caption.css +++ b/WebContent/VAADIN/themes/base/caption/caption.css @@ -6,40 +6,18 @@ white-space: nowrap; } .v-errorindicator { - float: left; + display: inline-block; } .v-caption .v-icon { - float: left; + display: inline-block; padding-right: 2px; vertical-align: middle; } .v-caption .v-captiontext { - float: left; + display: inline-block; overflow: hidden; vertical-align: middle; } .v-caption .v-required-field-indicator { - float: left; + display: inline-block; } - -.v-caption-clearelem { - clear: both; - width: 0; - height: 0; - 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 { - /* Fix possible sub pixel rounding errors that cause error indicators to drop */ - margin-right:-0.5px; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 74ed21bd1a..d2695a8015 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -31,9 +31,12 @@ div.v-app-loading { width: 100%; /* avoid scrollbars with margins in root layout */ outline: none; + position: relative; +} +/* Prevent margin collapse */ +.v-view.v-view-embedded { margin-top: -1px; border-top: 1px solid transparent; - position: relative; } /** * Try to handle printing somehow. Reasonable printing support @@ -89,7 +92,15 @@ div.v-app-loading { border: none; padding: 0; margin: 0; + height: 100%; +} +.v-form-content { + height: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } + /* Field modified */ /* Disabled by default .v-modified, .v-richtextarea.v-modified iframe.gwt-RichTextArea, @@ -231,6 +242,10 @@ div.v-app-loading { cursor: default; } +.v-clip { + overflow: hidden; +} + .v-scrollable { overflow: auto; -}
\ No newline at end of file +} diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.css b/WebContent/VAADIN/themes/base/csslayout/csslayout.css index 1f85d6f460..064edd28a4 100644 --- a/WebContent/VAADIN/themes/base/csslayout/csslayout.css +++ b/WebContent/VAADIN/themes/base/csslayout/csslayout.css @@ -1,6 +1,19 @@ .v-csslayout { overflow: hidden; } +.v-csslayout-margin, .v-csslayout-container { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.v-has-width > .v-csslayout-margin, +.v-has-width > .v-csslayout-margin > .v-csslayout-container { + width: 100%; +} +.v-has-height > .v-csslayout-margin, +.v-has-height > .v-csslayout-margin > .v-csslayout-container { + height: 100%; +} .v-csslayout-margin-top { padding-top: 12px; } diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 8e2e9aeb2b..7af440c735 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -64,16 +64,6 @@ color: #666; } -.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; -} - .v-datefield-time { white-space: nowrap; } @@ -97,10 +87,3 @@ background-color: #ffe0e0; } */ -/* 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); -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.css b/WebContent/VAADIN/themes/base/formlayout/formlayout.css index 9566ff1663..755a59bc89 100644 --- a/WebContent/VAADIN/themes/base/formlayout/formlayout.css +++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.css @@ -1,3 +1,9 @@ +.v-formlayout.v-has-width > table { + width: 100%; +} +.v-formlayout.v-has-height > table { + height: 100%; +} .v-formlayout-cell .v-errorindicator { display: block; } @@ -9,6 +15,9 @@ text-align:right; white-space: nowrap; } +.v-formlayout-errorcell, .v-formlayout-captioncell { + width: 1px; /* Don't use any extra space */ +} .v-formlayout-captioncell .v-caption { overflow: visible; } diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css index 87cdcfd361..9edaf152a0 100644 --- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css +++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css @@ -1,3 +1,9 @@ +.v-gridlayout { + position: relative; +} +.v-gridlayout-slot { + position: absolute; +} .v-gridlayout-margin-top { padding-top: 12px; } @@ -23,8 +29,3 @@ .v-gridlayout-spacing-off { overflow: hidden; } -/* Ensure that resizing gridlayout works in IE */ -.v-ie6 .v-gridlayout, -.v-ie7 .v-gridlayout { - overflow: hidden; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/label/label.css b/WebContent/VAADIN/themes/base/label/label.css new file mode 100644 index 0000000000..366dbdf26f --- /dev/null +++ b/WebContent/VAADIN/themes/base/label/label.css @@ -0,0 +1,3 @@ +.v-label { + overflow: hidden; +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css index 8b44085c28..943d0dcc21 100644 --- a/WebContent/VAADIN/themes/base/menubar/menubar.css +++ b/WebContent/VAADIN/themes/base/menubar/menubar.css @@ -1,6 +1,7 @@ .v-menubar { float: left; /* Force minimum width */ white-space: nowrap; + overflow: hidden; } .v-menubar .v-menubar-menuitem { cursor: default; diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css index 9f91669385..727ca92f72 100644 --- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css +++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css @@ -1,3 +1,9 @@ +.v-orderedlayout, +.v-horizontallayout, +.v-verticallayout { + position: relative; +} + .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { @@ -31,12 +37,7 @@ padding-top: 0; 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 { - overflow: hidden; + +.v-horizontallayout-slot, .v-verticallayout-slot { + position: absolute; } diff --git a/WebContent/VAADIN/themes/base/paintable/paintable.css b/WebContent/VAADIN/themes/base/paintable/paintable.css new file mode 100644 index 0000000000..41fc0ef287 --- /dev/null +++ b/WebContent/VAADIN/themes/base/paintable/paintable.css @@ -0,0 +1,5 @@ +.v-connector { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/panel/panel.css b/WebContent/VAADIN/themes/base/panel/panel.css index 74d7b67a35..d5a9915490 100644 --- a/WebContent/VAADIN/themes/base/panel/panel.css +++ b/WebContent/VAADIN/themes/base/panel/panel.css @@ -29,6 +29,15 @@ overflow: hidden; } .v-panel-content { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.v-panel.v-has-width > .v-panel-content { + width: 100%; +} +.v-panel.v-has-height > .v-panel-content { + height: 100%; } .v-panel-deco { }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css index a9a90c4b06..4037802cf2 100644 --- a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css @@ -1,21 +1,17 @@ .v-progressindicator { - overflow: hidden; /* for IE6 */ width: 150px; } .v-progressindicator-wrapper { - overflow: hidden; /* for IE6 */ height: 7px; border: 1px solid #ddd; } .v-progressindicator-indicator { height: 7px; - overflow: hidden; /* for IE6 */ background: #ddd; } div.v-progressindicator-indeterminate { height: 20px; width: 20px; - overflow: hidden; /* for IE6 */ background: #fff url(../common/img/ajax-loader-medium.gif) no-repeat 50%; border-radius: 4px; -webkit-border-radius: 4px; @@ -31,6 +27,5 @@ div.v-progressindicator-indeterminate { div.v-progressindicator-indeterminate-disabled { height: 20px; width: 20px; - overflow: hidden; /* for IE6 */ background: transparent; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/select/select.css b/WebContent/VAADIN/themes/base/select/select.css index 4487bc6a4e..b9d0dda51f 100644 --- a/WebContent/VAADIN/themes/base/select/select.css +++ b/WebContent/VAADIN/themes/base/select/select.css @@ -56,6 +56,7 @@ .v-filterselect { white-space: nowrap; text-align: left; + display: inline-block; } .v-filterselect .v-icon { float: left; @@ -63,15 +64,19 @@ .v-app .v-filterselect-input, .v-window .v-filterselect-input, .v-popupview-popup .v-filterselect-input { + margin: 0; float: left; -webkit-border-radius: 0px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .v-filterselect-prompt .v-filterselect-input { color: #999; font-style: italic; } .v-filterselect-button { - float: right; + display: inline-block; cursor: pointer; width: 1em; height: 1em; diff --git a/WebContent/VAADIN/themes/base/shadow/shadow.css b/WebContent/VAADIN/themes/base/shadow/shadow.css index 209dd0e235..c576a026bd 100644 --- a/WebContent/VAADIN/themes/base/shadow/shadow.css +++ b/WebContent/VAADIN/themes/base/shadow/shadow.css @@ -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; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/slider/slider.css b/WebContent/VAADIN/themes/base/slider/slider.css index 5ee6cbf31c..1be474f04e 100644 --- a/WebContent/VAADIN/themes/base/slider/slider.css +++ b/WebContent/VAADIN/themes/base/slider/slider.css @@ -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; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css index 80a2133b23..7831a8d9ce 100644 --- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css +++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css @@ -4,11 +4,9 @@ } .v-splitpanel-hsplitter { width: 6px; - font-size: 1px; /* for IE6 */ } .v-splitpanel-hsplitter div { width: 6px; - font-size: 1px; /* for IE6 */ position: absolute; top: 0; bottom: 0; @@ -21,11 +19,9 @@ } .v-splitpanel-vsplitter { height: 6px; - font-size: 1px; /* for IE6 */ } .v-splitpanel-vsplitter div { height: 6px; - font-size: 1px; /* for IE6 */ background: #ddd; cursor: s-resize; cursor: row-resize; @@ -33,13 +29,3 @@ .v-disabled .v-splitpanel-vsplitter div { 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; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index 2c1e3d9593..653063ccb5 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -26,9 +26,6 @@ overflow: hidden; text-align: left; /* Force default alignment */ } -.v-ie7 .v-table { - overflow: visible; -} .v-table-header-wrap { overflow: hidden; border: 1px solid #aaa; @@ -102,10 +99,6 @@ white-space: nowrap; margin-left: 6px; } -.v-ie7 .v-table-caption-container-align-right { - margin-left: 0px; - padding-left: 6px; -} .v-table-caption-container-align-right { float: right; } @@ -193,10 +186,6 @@ .v-table.v-disabled .v-table-column-selector { cursor: default; } -.v-ie6 .v-table-column-selector, -.v-ie7 .v-table-column-selector { - position: static; -} .v-table-focus-slot-left { border-left: 2px solid #999; float: none; diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css index 7288d32d89..d369cd99f0 100644 --- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css @@ -39,9 +39,6 @@ text-align: right; margin-top: -1em; } -.v-ff2 .v-tabsheet-scroller { - position: relative; -} .v-disabled .v-tabsheet-scroller { display: none; } @@ -84,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; @@ -118,10 +111,6 @@ border-bottom: none; position: relative; } -.v-ie6 .v-tabsheet-content, -.v-ie7 .v-tabsheet-content { - zoom: 1; -} .v-tabsheet-deco { height: 1px; background: #aaa; diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png Binary files differdeleted file mode 100644 index f0e5953235..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png Binary files differdeleted file mode 100644 index 0d2fd54885..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png Binary files differdeleted file mode 100644 index 1a7758fce5..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png Binary files differdeleted file mode 100644 index db94fc0d8e..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/tree-connectors.css b/WebContent/VAADIN/themes/base/tree/tree-connectors.css index 6e7ce45391..c60e41c48b 100644 --- a/WebContent/VAADIN/themes/base/tree/tree-connectors.css +++ b/WebContent/VAADIN/themes/base/tree/tree-connectors.css @@ -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; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/tree/tree-default.css b/WebContent/VAADIN/themes/base/tree/tree-default.css index c486233ea8..23721c77ae 100644 --- a/WebContent/VAADIN/themes/base/tree/tree-default.css +++ b/WebContent/VAADIN/themes/base/tree/tree-default.css @@ -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); } diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.css b/WebContent/VAADIN/themes/base/treetable/treetable.css index 1bc21b890c..de505ba774 100644 --- a/WebContent/VAADIN/themes/base/treetable/treetable.css +++ b/WebContent/VAADIN/themes/base/treetable/treetable.css @@ -5,26 +5,15 @@ /* defines the amount of indent per level */ width: 18px; } -.v-ie7 .v-treetable-treespacer{ - height: 100%; /* #7388 */ -} .v-treetable-node-closed { 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; diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css index e6b58fb14e..adc5751d7c 100644 --- a/WebContent/VAADIN/themes/base/upload/upload.css +++ b/WebContent/VAADIN/themes/base/upload/upload.css @@ -2,10 +2,6 @@ white-space: nowrap; } -.v-ie6 .v-upload, -.v-ie7 .v-upload { - margin:0; -} .v-upload-immediate { position: relative; diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css index 398238426e..d728e7f60e 100644 --- a/WebContent/VAADIN/themes/base/window/window.css +++ b/WebContent/VAADIN/themes/base/window/window.css @@ -1,16 +1,39 @@ .v-window { background: #fff; } +.v-window-contents { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.v-window.v-has-width > div.popupContent, +.v-window.v-has-width .v-window-wrap, +.v-window.v-has-width .v-window-contents, +.v-window.v-has-width .v-window-contents > div { + width: 100%; +} + +.v-window.v-has-height > div.popupContent, +.v-window.v-has-height .v-window-wrap, +.v-window.v-has-height .v-window-contents, +.v-window.v-has-height .v-window-contents > div { + height: 100%; +} + .v-window-outerheader { padding: 0.3em 1em; - height: 1em; + height: 1.6em; + position: relative; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .v-window-outerheader, .v-window-draggingCurtain { cursor: move; } - .v-window-header { font-weight: bold; } @@ -22,21 +45,9 @@ 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 */ } -/* Partial fix for bug #1106 */ -/* Target Firefox 2 (somehow this will force almost all window borders on top of a Flash object) */ -.v-window-contents, x:-moz-any-link { - overflow: hidden; -} -/* Target Firefox 3 (it doesn't need any trickery, so revert the previous) */ -.v-window-contents, x:-moz-any-link, x:default { - overflow: visible; -} .v-window-contents > div { outline: none; } @@ -88,15 +99,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; @@ -158,13 +160,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; -}
\ No newline at end of file |
