From 2094e841be4a7ba25357ca675d47bc0d1ed02ef2 Mon Sep 17 00:00:00 2001 From: Jonatan Kronqvist Date: Tue, 7 Dec 2010 09:34:15 +0000 Subject: [PATCH] Fixed the broken TableRowHeight2 & -3 tests svn changeset:16336/svn branch:6.5 --- WebContent/VAADIN/themes/base/styles.css | 1 - WebContent/VAADIN/themes/liferay/styles.css | 1 - WebContent/VAADIN/themes/reindeer/styles.css | 1 - WebContent/VAADIN/themes/runo/styles.css | 5 +- WebContent/VAADIN/themes/runo/table/table.css | 4 +- .../VAADIN/themes/tests-tickets/styles.css | 999 ------------------ .../components/table/TableRowHeight2.java | 5 - 7 files changed, 4 insertions(+), 1012 deletions(-) diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 5c887e43d6..b16628591c 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -1531,7 +1531,6 @@ div.v-progressindicator-indeterminate-disabled { margin-left: 0px; padding-left: 6px; } - .v-table-caption-container-align-right { float: right; } diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css index 25c6252f2d..c81e3d834a 100644 --- a/WebContent/VAADIN/themes/liferay/styles.css +++ b/WebContent/VAADIN/themes/liferay/styles.css @@ -1531,7 +1531,6 @@ div.v-progressindicator-indeterminate-disabled { margin-left: 0px; padding-left: 6px; } - .v-table-caption-container-align-right { float: right; } diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index db13626cf0..fe8e7a1539 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -1531,7 +1531,6 @@ div.v-progressindicator-indeterminate-disabled { margin-left: 0px; padding-left: 6px; } - .v-table-caption-container-align-right { float: right; } diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 42d90beb86..22efe6eac1 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -1531,7 +1531,6 @@ div.v-progressindicator-indeterminate-disabled { margin-left: 0px; padding-left: 6px; } - .v-table-caption-container-align-right { float: right; } @@ -3707,9 +3706,9 @@ div.v-csslayout-box-shadow { .v-table-caption-container { color: #393a3c; font-size: 15px; - padding: 9px 2px 9px 4px; + padding: 9px 2px 9px 0; text-shadow: #ffffff 0 1px 0; - margin-left: 0px; + margin-left: 4px; } .v-table-sort-indicator { width: 0; diff --git a/WebContent/VAADIN/themes/runo/table/table.css b/WebContent/VAADIN/themes/runo/table/table.css index db8be66fc0..f3dcedaff8 100644 --- a/WebContent/VAADIN/themes/runo/table/table.css +++ b/WebContent/VAADIN/themes/runo/table/table.css @@ -24,9 +24,9 @@ .v-table-caption-container { color: #393a3c; font-size: 15px; - padding: 9px 2px 9px 4px; + padding: 9px 2px 9px 0; text-shadow: #ffffff 0 1px 0; - margin-left: 0px; + margin-left: 4px; } .v-table-sort-indicator { width: 0; diff --git a/WebContent/VAADIN/themes/tests-tickets/styles.css b/WebContent/VAADIN/themes/tests-tickets/styles.css index 9aa67036e5..28dce2eae7 100644 --- a/WebContent/VAADIN/themes/tests-tickets/styles.css +++ b/WebContent/VAADIN/themes/tests-tickets/styles.css @@ -271,1005 +271,6 @@ color:blue; } - -/* Logica theme */ - -/* Import Toolkit default theme */ - -.v-generated-body { - overflow: hidden; -} -.v-view { - background: #fff; - position: relative; -} -.v-window-modalitycurtain { - background: #000; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.v-app input, .v-window input, -.v-app select, .v-window select, -.v-app textarea, .v-window textarea, -.v-app button, .v-window button, -.v-formlayout-captioncell { - font-size: 11px; - font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif !important; - color: #2c3437 !important; -} -.v-formlayout-captioncell { - font-weight: bold; -} - -.v-loading-indicator, -.v-loading-indicator-delay, -.v-loading-indicator-wait { - width: 174px; - height: 12px; - background: url(img/loading-indicator.gif) top left no-repeat; - position: absolute; - top: 12px !important; - right: 15px !important; -} - - - -.v-window-contents { - border: 1px solid #9ab2bf; - font-size: 11px; -} -.v-window-header { - color: #094582 !important; - font-size: 15px; - font-weight: bold; - float: left; -} -.v-window-closebox, -.v-window-closebox:hover { - background-image: url(img/window/close.png) !important; -} - - -/* -.v-datefield { - margin: 2px; -} -.v-datefield .v-textfield { - float: left; -} -.v-datefield .v-textfield, -.v-datefield .v-datefield-button { - margin: 0px; -} -*/ -/* -.v-textfield, .v-datefield, .v-filterselect{ -height:20px; -width:125px; -padding:0; -margin:0; -} - - -.v-datefield-textfield, .v-filterselect-input{ -height:14px; -width:107px; -padding:2px; -} - -.v-datefield-button { - background: url(img/datefield/open-button.png) top right no-repeat; - width: 20px; - height: 20px; - cursor: pointer; -} - -.v-filterselect { - background: #f6f9fc url(img/select/bg-left-filter.png) left top no-repeat; - height: 20px; - margin: 2px; -} -.v-filterselect-button { - height: 20px; - width:25px; - background-image: url(img/select/bg-right-filter.png); -} - -.v-filterselect-suggestpopup { - font-size: 11px; -} - -* + html .v-filterselect-button { - margin-top: -22px; /-* for IE *-/ -} - -/* -.v-datefield-popup { - margin-top: -1px; - margin-left: -1px; -} - - -.v-customcomponent-view { - overflow: hidden; /* for IE *-/ -} - -*/ -.v-button{ - font-size: 11px; - font-weight: bold; - color: #122942 !important; - /*background: url(img/button/left2.png) top left no-repeat;*/ -} - -.v-button span { - /*background: url(img/button/right2.png) top right no-repeat;*/ -} - -.v-button img { - float: left; /* possible icon */ -} - -/* -.v-button:hover { background-image: url(img/button/left2_down.png); } -.v-button:hover span { background-image: url(img/button/right2_down.png); } -*/ - -.v-button-link, -.v-button-link span, -.v-button-link:hover, -.v-button-link:hover span { - border: none; - background: none; -} - -.v-textfield-error { - background: #ffa0a0 !important; -} - -.v-textarea, .v-textfield, .v-numerictextfield input, .v-filterselect input { - border: 1px solid #8fa5b3; - height:18px; - background: #f6f9fc url(img/input_bg.png) left top repeat-x; -} -.v-select-twincol-selections, -.v-select-twincol-options { - border: 1px solid #8fa5b3; - background: #f6f9fc url(img/input_bg.png) left top repeat-x; -} - -.v-errorindicator { - float: left; - padding-right: 7px; -} - -.v-table { - color: #2c3437; -} - -.v-table .v-selected { - color: #2c3437; - background: #faffd1; -} -.v-table-row:hover, .v-table-row-odd:hover { - background: #c8def9; -} -/* -.v-table-header-wrap { - background: #d4e7fe url(img/table/column_header_bg.png) top left repeat-x; - height: 25px; -} -*/ -.v-table-header-cell:hover, -.v-table-header-cell-asc:hover, -.v-table-header-cell-desc:hover { - background: #d4e7fe url(img/table/column_header_bg.png) top left repeat-x; -} -.v-table-cell-content { - font-size: 11px; - border-right: 1px solid #e3e7f0; - margin: 0; - padding: 2px 2px 2px 3px; -/* height: 20px;*/ -} -.v-table-header-cell-asc .v-table-caption-container { - background: url(img/table/order_asc.png) right 50% no-repeat; -} -.v-table-header-cell-desc .v-table-caption-container { - background: url(img/table/order_desc.png) right 50% no-repeat; -} -.v-table-caption-container { - color: #48738c; - font-size: 11px; - font-weight: bold; - padding-top: 6px; -} -.v-table-column-selector { - background-image: url(img/table/colsel.png); - background-position: 0px 5px; - cursor: pointer; -} - - -.v-contextmenu { - font-size: 11px; - color: #000; -} -.v-contextmenu .gwt-MenuBar { - background: #5f5f5f; /* shadow */ - border: none; -} -.v-contextmenu .gwt-MenuBar table { - border: 1px solid #a0a0a0 !important; - background: #f0f0f0; - position: relative; - top: -3px; - left: -2px; -} -.v-contextmenu .gwt-MenuItem { - padding: 2px; -} -.v-contextmenu .gwt-MenuItem div { - padding: 1px 25px 1px 13px; -} -.v-contextmenu .v-on div { - background: url(img/checked.png) center left no-repeat; - color: #000; -} -.v-contextmenu .v-off div { - background: url(img/unchecked.png) center left no-repeat; - color: #6f6f6f; -} -.v-contextmenu .v-on div:hover { - color: #000; -} -.v-contextmenu .v-off div:hover { - color: #000; -} - -.v-accordion { - background: #fff url(img/accordion/bg.gif) top left repeat-x; - border: solid #96B0CF; - border-width: 1px 1px 1px 1px; -} -.v-accordion-item { - background:transparent; - border-top: 1px solid #b9c5cf; - height:21px; - /* TODO: the rounded top left corner - /*background: #ffffff url(img/accordion/top.gif) top left no-repeat;*/ -} -.v-accordion-item-first { - border-top: none; - /* TODO: the rounded top left corner - /*background: #ffffff url(img/accordion/top.gif) top left no-repeat;*/ -} -.v-accordion-item-caption { - background: transparent url(img/accordion/arrow-left.gif) 7px 5px no-repeat; - border: none; - padding: 0px 0px 0px 18px; - font-size: 12px; - font-weight: bold; - color: #1d4466; - height: 21px; -} -.v-accordion-item-caption .v-icon { - float: left; - padding: 1px; -} -.v-accordion-item-open .v-caption { - border: none; - background: url(img/accordion/tab-on-bg.gif) top left no-repeat; - padding: 0px 0px 0px 19px; - height: 21px; -} - -.v-accordion-item .v-caption { - border: none; - padding: 0px 0px 0px 19px; - height: 21px; -} - -.v-accordion-item-open .v-accordion-item-caption { - background: url(img/accordion/tab-on-right-bg.gif) top right no-repeat; - color: #fff; - padding-left: 2px; - border:0; -} - -.v-accordion-item-content { -} - -.v-tree-node { - background-image: url(img/tree/expand.png); -} -.v-tree-node-expanded { - background-image: url(img/tree/collapse.png); -} -.v-tree-node-caption { - color: #2c3437; - font-size: 11px; - font-weight: bold; -} -.v-tree { - background: url(img/tree/2x583-dotline.png) 5px bottom repeat-y; -} -.v-tree-node-children { - background: url(img/tree/2x583-dotline.png) 21px bottom repeat-y; -} -.v-tree-node-leaf { - background: url(img/tree/node.png) 5px center no-repeat; -} -.v-tree-node-selected, -.v-tree-node-selected span { - background: transparent; - color: #2f76cc; -} - - -.v-panel-caption span { - /*color: #005290;*/ - font-size: 11px; - font-weight: bold; - letter-spacing: 0; -} -.v-panel-caption, .v-panel-caption-light { - padding: 1px 18px 4px 5px; - border: none !important; - background: url(img/caption_light_bg.png) bottom left repeat-x; - /*margin: 1px 10px;*/ -} -.v-panel-caption .v-icon, .v-panel-caption-light .v-icon { - /*margin: 0px 2px;*/ - } -.v-panel:before, -.v-panel-caption:before, -.v-panel-nocaption:before, -.v-panel-deco:before, -.v-panel-deco { - background: none; /* remove unnecessary graphics */ -} -.v-panel-content { - /*margin: 0px 10px;*/ - border: 1px solid #d3d4dc !important; -} -.v-panel-deco { - height: 9px; -} -* html .v-panel-deco { - height: 9px !important; -} -*+html .v-panel-deco { - height: 9px !important; -} - -.v-tabsheet .v-tabsheet-tabs { - height: auto; -} -.v-tabsheet .v-tabsheet-tabs .v-caption { - background: none !important; - white-space: nowrap; -} -.v-tabsheet .v-tabsheet-tabs .gwt-TabBarItem { - background: url(img/tabsheet/tab-bg-edit.gif) top right no-repeat; - border-width: 0px 0px 0px 1px; - border-style: solid; - border-color: #9ab2bf; - margin: 0; - padding: 8px 15px 0px 10px; - font-size: 11px; - font-weight: normal; - height: 24px; - color: #324955; -} -.v-tabsheet .gwt-TabBarItem:hover { - color: #2f759a; -} -.v-tabsheet .v-tabsheet-tabs .gwt-TabBarItem-selected { - background: url(img/tabsheet/tab-on-bg.gif) right top no-repeat; - font-weight: bold; - color: #094582; - margin: 0; -} -.v-tabsheet .gwt-TabBarItem-selected:hover { - color: #094582; -} -.v-tabsheet .v-tabsheet-tabs .gwt-TabBarItem-selected .v-caption { - height: auto; - margin: 0 !important; - padding: 0 !important; -} -.v-tabsheet .v-tabsheet-tabs .gwt-TabBarRest { - background: none; - height: 31px !important; - border-width: 0px 0px 1px 0px; - border-color: #9ab2bf; - -} -.v-tabsheet .v-tabsheet-content { - border-width: 0px 1px 1px 1px; - border-style: solid; - border-color: #9ab2bf; -} -.v-tabsheet .v-caption .v-icon { - display: inline; -} -.v-tabsheet .v-tabsheet-deco { - display: none; -} -.v-tabsheet-loading .v-tabsheet-tabs .gwt-TabBarItem-selected span { - /*background-position: 1px 7px;*/ - background: none; /* hide loading indicator */ -} - -.v-tabsheet-scroller { - /*margin-top: -29px;*/ -} -.v-tabsheet-scrollerNext, .v-tabsheet-scrollerNext-disabled { - background-image: url(img/tabsheet/next.png); -} -.v-tabsheet-scrollerPrev, .v-tabsheet-scrollerPrev-disabled { - background-image: url(img/tabsheet/prev.png); -} -.v-tabsheet-scrollerPrev, -.v-tabsheet-scrollerNext, -.v-tabsheet-scrollerPrev-disabled, -.v-tabsheet-scrollerNext-disabled { - height: 30px; -} - - -.v-splitpanel-horizontal .v-splitpanel-hsplitter, -.v-splitpanel-horizontal .v-splitpanel-hsplitter div { - border: 0px; - width: 11px; -} -.v-splitpanel-horizontal .v-splitpanel-hsplitter { - background: #c6dbf0 url(img/splitpanel/vsplit-bg.gif) top left repeat-y; -} -.v-splitpanel-horizontal .v-splitpanel-hsplitter div { - margin: 0px; - background: url(img/splitpanel/vsplit-toggle.gif) top left no-repeat; -} - -.v-splitpanel-vertical .v-splitpanel-vsplitter, -.v-splitpanel-vertical .v-splitpanel-vsplitter div { - border: 0px; - height: 11px; -} -.v-splitpanel-vertical .v-splitpanel-vsplitter { - background: #c6dbf0 url(img/splitpanel/hsplit-bg.gif) top left repeat-x; -} -.v-splitpanel-vertical .v-splitpanel-vsplitter div { - margin: 0px; - background: url(img/splitpanel/hsplit-toggle.gif) top left no-repeat; -} - - -.v-label-copyright { - position: absolute; - bottom: 0px; - left: 0px; - background: url(img/copyright-bg.gif) #def0fe right top no-repeat; - color: #90b1cf; - font-weight: bold; - font-size: 11px; - padding-right: 25px; - padding-left: 5px; - width: 171px; - white-space: nowrap; -} - -/* -- header -- */ - -.v-orderedlayout-header { - background: #004a8a url(img/header/headerbg.gif); - border:0; - margin:0; - padding:0; -} - -.v-orderedlayout-header .v-label-logo { - background: url(img/logica-logo-edit.gif) top left no-repeat; - width: 111px; - height: 32px; - text-indent: -100em; - margin: 2px 0 0 0; -} - -.v-orderedlayout-header .v-orderedlayout-module-selector-menu .v-button { - background: url(img/moduleselector/modulebg.gif); - margin-top: 2px; - height: 32px; - border:none; - border-left:2px solid #1c4d72; - border-right:2px solid #2c6da2; -} - -.v-orderedlayout-header .v-orderedlayout-module-selector-menu .v-button-selected { - background-image: url(img/moduleselector/modulebg-on.gif); - height: 32px; - border-left:2px solid #1c4d72; - border-right:2px solid #2c6da2; -} - -.v-orderedlayout-header .v-orderedlayout-module-selector-menu .v-button span { - background:none; - color: #fff; - font-size: 11px; - font-weight: bold; - padding: 5px 10px; - height: 32px; -} - -.v-orderedlayout-header .v-orderedlayout-module-selector-menu .v-button-selected span { - color: #000; - border: none; -} - -.v-orderedlayout-header .v-orderedlayout-module-selector-menu .v-button:hover span { - text-decoration: underline; -} - -/* -- topmenu -- */ - -.v-orderedlayout-topmenu { - background: #ddecfe url(img/topmenu/menubarbg.gif) top right repeat-x; -} -.v-orderedlayout-topmenu .v-orderedlayout-breadcrumbs div, -.v-orderedlayout-topmenu .v-orderedlayout-breadcrumbs table { - height: 100%; -} -.v-orderedlayout-topmenu .v-orderedlayout-breadcrumbs { - background: #fffff7 url(img/topmenu/crumbbg.gif) top right repeat-x; - height: 100%; -} -.v-orderedlayout-topmenu .v-orderedlayout-breadcrumbs .v-button { - height: 100%; - padding: 0px; -} -.v-orderedlayout-topmenu .v-orderedlayout-breadcrumbs .v-button, -.v-orderedlayout-topmenu .v-orderedlayout-breadcrumbs .v-button span { - background: none; - border: none; -} -.v-orderedlayout-topmenu .v-orderedlayout-breadcrumbs .v-button:hover span { - text-decoration: underline; -} -.v-orderedlayout-topmenu .v-orderedlayout-breadcrumbs span { - font-weight: normal; - color: #877845; - padding: 5px 6px 0px 6px; - -} -.v-orderedlayout-topmenu .v-label-breadcrumbs-separator { - background: url(img/topmenu/crumbend.gif) top left repeat-x; - width: 9px; - height: 30px; -} -.v-orderedlayout-topmenu .v-orderedlayout-user-menu { - padding: 5px 10px 0px 0px; -} -.v-orderedlayout-topmenu .v-orderedlayout-user-menu .v-button-user-menu-link { - background: none; - border: none; - padding-top:3px; -} -.v-orderedlayout-topmenu .v-orderedlayout-user-menu .v-button-user-menu-link span { - background: none; - font-weight: normal; - color: #256ac1; - padding-right: 0px; -} -.v-orderedlayout-topmenu .v-orderedlayout-user-menu .v-button-user-menu-link:hover span { - color: #000; - border-bottom: 1px dotted #000; -} - - - -/* -- footer -- */ -.v-orderedlayout-footer { - background: #ddecfe url(img/footer/footerbg.gif) top left repeat-x; - border-top: 1px solid #96bad5; -} -.v-orderedlayout-footer .v-label-version, -.v-orderedlayout-footer .v-label-username { - padding: 5px; -} - - -/* -- login screen -- */ -#login-screen { - background: #f4faff; - width: 100%; - height: 100%; - float: left; - font-size: 12px; -} -#login-screen #login-top { - width: 100%; - height: 110px; - background: #f9fcff; - border-bottom: 3px solid #f9ab49; - float: left; - clear: left; - text-align: center; -} -#login-screen #login-top #top-container { - width: 550px; - height: 100%; - position: relative; - padding: 0px; - margin: 0px auto; - clear: left; -} -#login-screen #login-top #top-menu { - position: absolute; - bottom: 0px; - right: 0px; - height: 21px; - padding: 3px 10px 0px 10px; - background: url(img/login-screen/top-menu-bg.gif) #d4f1f0 left top repeat-x; - border-color: #d5dfe7; - border-width: 0px 2px 0px 2px; - border-style: solid; -} -#login-screen #login-top #top-menu #locale-select { - float: left; -} -#login-screen #login-top #top-menu #locale-select select { - width: 130px; -} -#login-screen #login-top #top-menu #help { - float: left; -} -#login-screen #login-top #top-menu #help button { - border-width: 0px 0px 1px 0px; - border-style: dotted; - border-color: #256ac1; - height: 1.6em; -} -#login-screen #login-top #top-menu #help button:hover { - border-style: solid; -} -#login-screen #login-top #top-menu #help button span { - color: #256ac1; - text-decoration: none; -} -#login-screen #login-top #top-menu .separator { - float: left; -} -#login-screen #login-top #top-menu .separator .v-label { - float: left; - height: 19px; - width: 3px; - background: url(img/login-screen/top-menu-separator.gif) center top no-repeat; - padding: 0px 10px; -} -#login-screen #login-top #logo { - background: url(img/login-screen/login-logo.png) left top no-repeat; - width: 200px; - height: 41px; - position: absolute; - bottom: 5px; - left: 0px; -} -#login-screen #login-main { - border-color: #aac5df; - border-style: solid; - border-width: 0px 1px 1px 1px; - width: 518px; - padding: 15px 15px 50px 15px; - margin: 0px auto; - clear: left; - position: relative; - background: #eaf5fe; -} -#login-screen #login-main #links { - float: left; - clear: left; - width: 100%; - text-align: center; -} -#login-screen #login-main #links button { - margin: 5px auto; - border-width: 0px 0px 1px 0px; - border-color: #d98511; - border-style: dotted; -} -#login-screen #login-main #links button span { - color: #d98511; - text-decoration: none; -} -#login-screen #login-main #links button:hover { - border-style: solid; -} -#login-screen #login-main #links button:hover span { - color: #000; -} -#login-screen .title { - color: #d98511; - font-weight: bold; - font-size: 130%; - padding-bottom: 5px; -} -#login-screen .v-label-login-label { - font-size: 130%; - padding: 0px 5px 0px 12px; -} -#login-screen .v-button-login-button { - width: auto; - margin-right: 3px; -} -#login-screen #login-banner { - width: 550px; - height: 87px; - background: url(img/login-screen/login-banner.jpg) left top no-repeat; - clear: left; - margin: 0px auto; -} -#login-screen #welcome-label { - color: #90b1cf; - font-size: 175%; - font-weight: bold; - padding: 12px 0px 0px 20px; -} -#login-screen #login-box { - border: 1px solid #d4ce9b; - background: url(img/login-screen/login-bg-noborder.gif) #fefddc left top repeat-x; - padding: 10px; - min-height: 140px; - width: 320px; - float: left; - clear: left; -} -#login-screen #login-box input { - background: url(img/login-screen/input-bg.gif) #f7f7ec left top no-repeat; - border: none; - width: 174px; - height: 25px; - padding: 5px 0px 0px 5px; - font-size: 140%; - font-weight: bold; -} -#login-screen .hint { - float: left; - width: 155px; - padding: 8px; -} -#login-screen .clear { - clear: both; -} -#login-screen #login-box td { - vertical-align: middle !important; -} -#login-screen .v-form fieldset{ - border: none; - padding: 0; - margin: 0; -} -#login-screen #login-box .label-capslock-on { - position: absolute; - margin-top: -20px; -} -#login-screen fieldset.v-form .v-form-description { - height: 0px; - overflow: hidden; -} -#login-screen .v-form-errormessage { - color: #F5440E; - font-size: 110%; - font-weight: bold; - float: left; - margin-top: 10px; - padding-top: 10px; - border-top: 1px dotted #d5cf1f; - background-position: 4px 10px; -} - - - -/* Logica components project (widgets) styles begins */ - -.v-multitextfield-popup { - padding: 5px; - border: solid 1px #f6b06a; - background: #ffcb02; -} - -.v-multitextfield-popup input, .v-multitextfield-popup textarea { - margin: 2px; -} - -.v-textfield-input_fi { - background: #ffffff url(multitextfield/img/fi.png) no-repeat 3px center; - padding-left: 21px; -} - -.v-textarea-input_fi { - background: #ffffff url(multitextfield/img/fi.png) no-repeat 3px 3px; - padding-left: 21px; -} - -.v-textfield-input_en { - background: #ffffff url(multitextfield/img/en.png) no-repeat 3px center; - padding-left: 21px; -} - -.v-textarea-input_en { - background: #ffffff url(multitextfield/img/en.png) no-repeat 3px 3px; - padding-left: 21px; -} - -.v-textfield-input_sv { - background: #ffffff url(multitextfield/img/sv.png) no-repeat 3px center; - padding-left: 21px; -} - -.v-textarea-input_sv { - background: #ffffff url(multitextfield/img/sv.png) no-repeat 3px 3px; - padding-left: 21px; -} - -.v-customcomponent-multioptionbutton { - background: #ffffff url(multioptionbutton/img/multibuttonbg.jpg) no-repeat top left; - padding: 2px; -} - -.v-customcomponent-multioptionbutton .v-gridlayout-linksTable button span { - text-decoration: none; - color:#34475F; - font: normal 11px Helvetica,Arial,'Trebuchet MS',Tahoma,Verdana,sans-serif; -} - -.v-customcomponent-multioptionbutton .v-gridlayout-linksTable button span { - text-decoration: none; - color:#34475F; - font: normal 11px Helvetica,Arial,'Trebuchet MS',Tahoma,Verdana,sans-serif; -} - -.v-customcomponent-multioptionbutton .v-gridlayout-linksTable button:hover span { - text-decoration: underline; -} - - -.v-customcomponent-multioptionbutton .v-gridlayout-linksTable img.v-icon { - float: left; - padding: 0px; - margin-right: 5px; -} - -.v-customcomponent-multioptionbutton .multioptionbutton-caption button span { - color:#34475F; - font: normal 14pt Helvetica,Arial,'Trebuchet MS',Tahoma,Verdana,sans-serif; - font-weight:normal; - margin:0px; - padding:0px; - text-decoration: none; -} - -.v-customcomponent-multioptionbutton .multioptionbutton-caption button:hover span { - text-decoration: underline; -} - - -.v-customcomponent-multioptionbutton .v-label-description { - color:#111111; - font-size:11px; - line-height:15px; -} - -.v-customcomponent-multioptionbutton img.v-icon { - padding: 7px 10px; -} - - -.v-tableselect-menutable table { - border-collapse: collapse; - padding: 0px; - margin: 0px; -} - -.v-tableselect-menutable table td { - height: 12px; -} - -.v-tableselect-tablerow-over { - background: #0000ff; - color: #ffffff; -} - -.v-tableselect-menutable table { - border-collapse: collapse; - border: 0px; -} - -.v-tableselect-menutable table td { - cursor:pointer; - height:18px; - padding:1px 5px; - white-space:nowrap; -} - -.v-tableselect-tablerow-over { - background: #5DAEE8; - color: #ffffff; -} - -.v-tableselect-table-header td { - background: #d8e5e8; -} - -.modalpanel-footer { - border-top: 1px solid #9AB2BF; - padding: 5px 10px; - background: #f5faff; -} - - - -.v-chaptextfield .capslock-on { - background: red; -} -.v-chaptextfield .label-capslock-on { - text-indent: -999999px; - background: url(chaptextfield/img/capslock.png) left top no-repeat; - height: 32px; - width: 32px; -} - - -.v-numerictextfield td { - vertical-align: middle !important; -} -.v-numerictextfield-left { - text-align: left; -} -.v-numerictextfield-right { - text-align: right; -} -.v-numerictextfield-stepper-up span, -.v-numerictextfield-stepper-down span { - display: none; -} -.v-numerictextfield-stepper-up, -.v-numerictextfield-stepper-down { - width: 11px; - height: 10px; - padding: 0px; - margin: 0px; - background: url(numerictextfield/img/stepper_bg.png) no-repeat; - border: none; - float: left; -} -.v-numerictextfield-stepper-up { - background-position: right top; -} -.v-numerictextfield-stepper-up:hover { - background-position: left top; -} -.v-numerictextfield-stepper-down { - background-position: right bottom; - clear: left; -} -.v-numerictextfield-stepper-down:hover { - background-position: left bottom; -} -.v-numerictextfield input { - margin-right: 1px; -} -.v-numerictextfield-stepper { - margin-right: 2px; -} -.v-numerictextfield-left-readonly, -.v-numerictextfield-right-readonly { - background: none !important; - border: none !important; - color: #222222 !important; -} - .dispnone { display:none; } diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java b/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java index f79b834fb1..0011fdca18 100644 --- a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java +++ b/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java @@ -9,9 +9,6 @@ import com.vaadin.ui.themes.BaseTheme; public class TableRowHeight2 extends TestBase { - private static final int TABLE_EXTRA = 2; // borders - private static final int COLEXTRASPACE = 6; // cell margins by theme - @Override protected String getDescription() { return "The table contains 2 rows, which both should be shown completely as the table height is undefined."; @@ -33,8 +30,6 @@ public class TableRowHeight2 extends TestBase { int COL_TITLE_W = 200; int COL_TEST_W = 98; - table.setWidth((COL_TEST_W + COL_TITLE_W + 2 * COLEXTRASPACE + TABLE_EXTRA) - + "px"); table.setPageLength(0); table.setColumnWidth("title", COL_TITLE_W); table.setColumnWidth("test", COL_TEST_W); -- 2.39.5