diff options
author | Artur Signell <artur.signell@itmill.com> | 2011-04-11 13:42:55 +0000 |
---|---|---|
committer | Artur Signell <artur.signell@itmill.com> | 2011-04-11 13:42:55 +0000 |
commit | 74cd89fdc2631854654301a0f3606c279c09c81b (patch) | |
tree | 4124c671011860aaf74156603c5bedaa5aab4a58 /WebContent/VAADIN | |
parent | e14e9943c2d20552d1cd3394349e733cfbefd2f2 (diff) | |
download | vaadin-framework-74cd89fdc2631854654301a0f3606c279c09c81b.tar.gz vaadin-framework-74cd89fdc2631854654301a0f3606c279c09c81b.zip |
#6811 TabSheet and Panel fixes needed for IE9
svn changeset:18210/svn branch:6.6
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/styles.css | 3 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css | 3 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/runo/panel/panel.css | 12 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/runo/styles.css | 31 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css | 15 |
5 files changed, 22 insertions, 42 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 2b76d5b46c..f98930f5ea 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -4828,7 +4828,8 @@ td.v-datefield-calendarpanel-nextyear { zoom: 1; display: inline; } -.v-ie8 .v-tabsheet-tabs .v-errorindicator { +.v-ie8 .v-tabsheet-tabs .v-errorindicator, +.v-ie9 .v-tabsheet-tabs .v-errorindicator { display: inline-block; } diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css index 409bd2c2bd..1c22a68a99 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css @@ -162,6 +162,7 @@ zoom: 1; display: inline; } -.v-ie8 .v-tabsheet-tabs .v-errorindicator { +.v-ie8 .v-tabsheet-tabs .v-errorindicator, +.v-ie9 .v-tabsheet-tabs .v-errorindicator { display: inline-block; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/panel/panel.css b/WebContent/VAADIN/themes/runo/panel/panel.css index 0b061fb9d9..0f516c5067 100644 --- a/WebContent/VAADIN/themes/runo/panel/panel.css +++ b/WebContent/VAADIN/themes/runo/panel/panel.css @@ -87,19 +87,13 @@ border: none; background: transparent; } -.v-ie6 .v-panel-content, -.v-ie7 .v-panel-content, -.v-ie8 .v-panel-content { +.v-ie .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 { +.v-ie .v-panel-content-light { border-bottom: none; } -.v-ie6 .v-panel-deco, -.v-ie7 .v-panel-deco, -.v-ie8 .v-panel-deco { +.v-ie .v-panel-deco { height: 0; overflow: hidden; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 326f0525cf..cd5aa778d3 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -1,5 +1,5 @@ -.v-theme-version:after {content:"6_5_4_dev-20110324";} -.v-theme-version-6_5_4_dev-20110324 {display: none;} +.v-theme-version:after {content:"6_6_0_dev-20110411";} +.v-theme-version-6_6_0_dev-20110411 {display: none;} /* Automatically compiled css file from subdirectories. */ .v-absolutelayout-wrapper { @@ -3237,19 +3237,13 @@ div.v-csslayout-box-shadow { border: none; background: transparent; } -.v-ie6 .v-panel-content, -.v-ie7 .v-panel-content, -.v-ie8 .v-panel-content { +.v-ie .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 { +.v-ie .v-panel-content-light { border-bottom: none; } -.v-ie6 .v-panel-deco, -.v-ie7 .v-panel-deco, -.v-ie8 .v-panel-deco { +.v-ie .v-panel-deco { height: 0; overflow: hidden; } @@ -4080,21 +4074,18 @@ tr.v-table-row-odd:hover { padding: 0; margin: 0; } -.v-ie6 .v-tabsheet-content, -.v-ie7 .v-tabsheet-content, -.v-ie8 .v-tabsheet-content { +.v-ie .v-tabsheet-content { border-bottom: none; } -.v-ie6 .v-tabsheet-deco, -.v-ie7 .v-tabsheet-deco, -.v-ie8 .v-tabsheet-deco { +.v-ie .v-tabsheet-deco { height: 1px; background: #babfc0; overflow: hidden; margin: 0; } .v-ie7 .v-tabsheet-deco, -.v-ie8 .v-tabsheet-deco { +.v-ie8 .v-tabsheet-deco, +.v-ie9 .v-tabsheet-deco { width: 100%; } /* Light-style */ @@ -4217,9 +4208,7 @@ tr.v-table-row-odd:hover { background: transparent url(tabsheet/img/inline-tab-left.png) no-repeat -7px 0; padding: 9px 11px 0 11px; } -.v-ie6 .v-tabsheet-deco-light, -.v-ie7 .v-tabsheet-deco-light, -.v-ie8 .v-tabsheet-deco-light { +.v-ie .v-tabsheet-deco-light { height: 0; } diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css index ad1c20fb55..9c224cb84f 100644 --- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css @@ -150,21 +150,18 @@ padding: 0; margin: 0; } -.v-ie6 .v-tabsheet-content, -.v-ie7 .v-tabsheet-content, -.v-ie8 .v-tabsheet-content { +.v-ie .v-tabsheet-content { border-bottom: none; } -.v-ie6 .v-tabsheet-deco, -.v-ie7 .v-tabsheet-deco, -.v-ie8 .v-tabsheet-deco { +.v-ie .v-tabsheet-deco { height: 1px; background: #babfc0; overflow: hidden; margin: 0; } .v-ie7 .v-tabsheet-deco, -.v-ie8 .v-tabsheet-deco { +.v-ie8 .v-tabsheet-deco, +.v-ie9 .v-tabsheet-deco { width: 100%; } /* Light-style */ @@ -287,8 +284,6 @@ background: transparent url(img/inline-tab-left.png) no-repeat -7px 0; padding: 9px 11px 0 11px; } -.v-ie6 .v-tabsheet-deco-light, -.v-ie7 .v-tabsheet-deco-light, -.v-ie8 .v-tabsheet-deco-light { +.v-ie .v-tabsheet-deco-light { height: 0; }
\ No newline at end of file |