summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base
diff options
context:
space:
mode:
Diffstat (limited to 'WebContent/VAADIN/themes/base')
-rw-r--r--WebContent/VAADIN/themes/base/button/button.css12
-rw-r--r--WebContent/VAADIN/themes/base/caption/caption.css8
-rw-r--r--WebContent/VAADIN/themes/base/datefield/datefield.css4
-rw-r--r--WebContent/VAADIN/themes/base/gridlayout/gridlayout.css1
-rw-r--r--WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css3
-rw-r--r--WebContent/VAADIN/themes/base/shadow/shadow.css17
-rw-r--r--WebContent/VAADIN/themes/base/slider/slider.css12
-rw-r--r--WebContent/VAADIN/themes/base/splitpanel/splitpanel.css5
-rw-r--r--WebContent/VAADIN/themes/base/table/table.css1
-rw-r--r--WebContent/VAADIN/themes/base/tabsheet/tabsheet.css7
-rw-r--r--WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.pngbin331 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.pngbin331 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.pngbin367 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.pngbin366 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/base/tree/tree-connectors.css14
-rw-r--r--WebContent/VAADIN/themes/base/tree/tree-default.css24
-rw-r--r--WebContent/VAADIN/themes/base/treetable/treetable.css8
-rw-r--r--WebContent/VAADIN/themes/base/upload/upload.css1
-rw-r--r--WebContent/VAADIN/themes/base/window/window.css22
19 files changed, 3 insertions, 136 deletions
diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index 2212120915..874619747e 100644
--- a/WebContent/VAADIN/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
@@ -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;
}
diff --git a/WebContent/VAADIN/themes/base/caption/caption.css b/WebContent/VAADIN/themes/base/caption/caption.css
index bdeaae3de2..549d4f9cef 100644
--- a/WebContent/VAADIN/themes/base/caption/caption.css
+++ b/WebContent/VAADIN/themes/base/caption/caption.css
@@ -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 {
diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css
index 72d9510c3f..ef08509ed5 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.css
@@ -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);
diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
index 87cdcfd361..033fea5867 100644
--- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
+++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
@@ -24,7 +24,6 @@
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/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
index 9f91669385..58badbc615 100644
--- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
+++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
@@ -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 {
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..3473092fa5 100644
--- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
@@ -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;
diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index 4b3922c554..dd452c851f 100644
--- a/WebContent/VAADIN/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
@@ -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;
}
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index 6fae7381a1..b150a1981e 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
@@ -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;
}
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png
deleted file mode 100644
index f0e5953235..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 0d2fd54885..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png
deleted file mode 100644
index 1a7758fce5..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index db94fc0d8e..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png
+++ /dev/null
Binary files differ
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..02f358e4e6 100644
--- a/WebContent/VAADIN/themes/base/treetable/treetable.css
+++ b/WebContent/VAADIN/themes/base/treetable/treetable.css
@@ -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;
diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css
index e6b58fb14e..e6951e5dbf 100644
--- a/WebContent/VAADIN/themes/base/upload/upload.css
+++ b/WebContent/VAADIN/themes/base/upload/upload.css
@@ -2,7 +2,6 @@
white-space: nowrap;
}
-.v-ie6 .v-upload,
.v-ie7 .v-upload {
margin:0;
}
diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css
index d4c03bd82e..d5dfd66e2b 100644
--- a/WebContent/VAADIN/themes/base/window/window.css
+++ b/WebContent/VAADIN/themes/base/window/window.css
@@ -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;
-} \ No newline at end of file