From 736820c8297656e6d0bcc6b8c56a3621ebfe32b2 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Fri, 26 Aug 2011 07:08:36 +0000 Subject: [PATCH] Chameleon theme fixes * Button with explicit width now behaves similarly across browsers, either clipping the text or ellipticizing it * DateField popup button now same height as the input field * Minor stylistic changes svn changeset:20673/svn branch:6.7 --- .../chameleon/components/button/button.css | 4 ++ .../components/datefield/datefield.css | 49 +++++++++++++++++-- .../chameleon/components/menubar/menubar.css | 5 ++ .../chameleon/components/selects/selects.css | 5 ++ .../chameleon/components/table/table.css | 9 ++++ .../components/textfield/textfield.css | 8 ++- .../compound/sidebar-menu/sidebar-menu.css | 2 + 7 files changed, 77 insertions(+), 5 deletions(-) diff --git a/WebContent/VAADIN/themes/chameleon/components/button/button.css b/WebContent/VAADIN/themes/chameleon/components/button/button.css index f3bd5b01d7..13fa53cc3f 100644 --- a/WebContent/VAADIN/themes/chameleon/components/button/button.css +++ b/WebContent/VAADIN/themes/chameleon/components/button/button.css @@ -26,6 +26,10 @@ div.v-button-down .v-button-wrap { background-image: none; } +.v-button { + overflow: hidden; + } + .v-button, .v-disabled.v-button:focus, .v-disabled.v-button:active { diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css index 7ea1075658..71771ad6e1 100644 --- a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css +++ b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css @@ -5,9 +5,50 @@ -webkit-border-bottom-right-radius: 3px; -moz-border-radius-topright: 3px; -moz-border-radius-bottomright: 3px; - height: 1.614999em; - padding: 0; width: 25px; + height: 1.2em; + padding: .2em 0; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + -ms-box-sizing: content-box; + box-sizing: content-box; + } + +.v-datefield-small .v-datefield-button { + height: 1.2em; + } + +.v-datefield-big .v-datefield-button { + padding: .3em 0; + height: 1.2em; + } + +.v-ie6 .v-datefield-button, +.v-ie7 .v-datefield-button { + height: 1.55em; + margin-top: 1px; + padding: 0; + } + +.v-ie7 .v-datefield-button { + height: 1.85em; + } + +.v-ie7 .v-datefield-small .v-datefield-button { + height: 1.75em; + } + +.v-ie7 .v-datefield-big .v-datefield-button { + height: 2em; + } + +.v-ie8 .v-datefield-button { + height: 1.6em; + padding: 0; + } + +.v-ie8 .v-datefield-big .v-datefield-button { + height: 1.8em; } input.v-datefield-textfield { @@ -23,7 +64,6 @@ input.v-datefield-textfield { * Big ******************************************************************************/ .v-datefield-big .v-datefield-button { - height: 1.85em; width: 32px; background-image: url(../../img/date-btn-big.png); } @@ -33,7 +73,6 @@ input.v-datefield-textfield { * Small ******************************************************************************/ .v-datefield-small .v-datefield-button { - height: 1.62em; width: 19px; background-position: 50% -2px; } @@ -239,9 +278,11 @@ td.v-datefield-calendarpanel-nextyear { -moz-border-radius: 2px; } +.v-datefield-calendarpanel-day-focused, .v-datefield-calendarpanel-day:hover { margin: 0 0 0 .2em; border: 1px solid #b3b3b3; + outline: none; } .v-datefield-calendarpanel-day-today { diff --git a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css index 225ccba033..00c8ed2457 100644 --- a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css +++ b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css @@ -20,4 +20,9 @@ .v-menubar-submenu .v-menubar-submenu-indicator { margin-top: .1em; + } + +.v-menubar-submenu .v-menubar-menuitem-selected { + background-image: url(../../img/grad-light-top2.png); + background-position: 0 -1px; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css b/WebContent/VAADIN/themes/chameleon/components/selects/selects.css index f9937d3f97..1d690f2035 100644 --- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css +++ b/WebContent/VAADIN/themes/chameleon/components/selects/selects.css @@ -121,6 +121,11 @@ body .v-filterselect-suggestpopup-big td { -ms-user-select: none; } +.v-filterselect-suggestmenu .gwt-menuItem-selected { + background-image: url(../../img/grad-light-top2.png); + background-position: 0 -1px; + } + .v-filterselect-suggestpopup-small .v-filterselect-status { font-size: .8em; } diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.css b/WebContent/VAADIN/themes/chameleon/components/table/table.css index 0974f7588b..b1aa9bef39 100644 --- a/WebContent/VAADIN/themes/chameleon/components/table/table.css +++ b/WebContent/VAADIN/themes/chameleon/components/table/table.css @@ -38,10 +38,19 @@ div.v-table-focus-slot-left { margin: 0; } +.v-table-row, +.v-table-row-odd { + background: transparent; + } + .v-table-generated-row { background: #c9c9c9; } +.v-table tr.v-selected { + background-image: url(/vaadin-demo-site/VAADIN/themes/chameleon/img/grad-light-top2.png); + background-position: 0 -1px; + } div.v-table-focus-slot-right { background: transparent; diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css index 6b5558789a..9fa38dd73f 100644 --- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css +++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css @@ -12,10 +12,16 @@ textarea.v-textarea, -moz-border-radius: 2px; -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.2); -moz-box-shadow: 0 1px 0 rgba(255,255,255,.2); - padding: .1em .2em; margin: 0; } +input.v-textfield[type="text"], +textarea.v-textarea, +.v-filterselect { + padding: .2em; + height: 1.2em; + } + body input.v-textfield, body textarea.v-textarea, body input.v-filterselect-input { diff --git a/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css b/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css index 8da3581291..e2ab7f2080 100644 --- a/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css +++ b/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css @@ -28,6 +28,8 @@ .sidebar-menu .selected { font-weight: bold; background-color: #333; + background-image: url(../../img/grad-light-top2.png); + background-position: 0 -1px; color: #fff; } -- 2.39.5