From: Jouni Koivuviita Date: Tue, 9 Oct 2007 14:04:09 +0000 (+0000) Subject: -FilterSelect styles modified (new paging buttons and indicator position) X-Git-Tag: 6.7.0.beta1~5878 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4588e05de09271d3b86b799b55fcde790ec2a480;p=vaadin-framework.git -FilterSelect styles modified (new paging buttons and indicator position) svn changeset:2473/svn branch:trunk --- diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java index 81e6e922f3..f591006411 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java @@ -109,7 +109,7 @@ public class IFilterSelect extends Composite implements Paintable, public void showSuggestions(Collection currentSuggestions, int currentPage, int totalSuggestions) { menu.setSuggestions(currentSuggestions); - int x = IFilterSelect.this.tb.getAbsoluteLeft(); + int x = IFilterSelect.this.getAbsoluteLeft(); int y = IFilterSelect.this.tb.getAbsoluteTop(); y += IFilterSelect.this.tb.getOffsetHeight(); this.setPopupPosition(x, y); @@ -127,7 +127,7 @@ public class IFilterSelect extends Composite implements Paintable, if (b) { DOM.sinkEvents(down, Event.ONCLICK); DOM.setElementProperty(down, "className", CLASSNAME - + "-nextpage-on"); + + "-nextpage"); } else { DOM.sinkEvents(down, 0); DOM.setElementProperty(down, "className", CLASSNAME @@ -139,7 +139,7 @@ public class IFilterSelect extends Composite implements Paintable, if (b) { DOM.sinkEvents(up, Event.ONCLICK); DOM.setElementProperty(up, "className", CLASSNAME - + "-prevpage-on"); + + "-prevpage"); } else { DOM.sinkEvents(up, 0); DOM.setElementProperty(up, "className", CLASSNAME diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css b/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css index 6a3fe14392..52cecb1a18 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css @@ -35,6 +35,7 @@ color: #464f52; font-size: 12px; line-height: 18px; + margin-top: -1px; } .i-filterselect-suggestmenu .gwt-MenuItem { @@ -43,23 +44,68 @@ } .i-filterselect-suggestmenu .gwt-MenuItem-selected { - background: #c6cccd; - color: #444d4e; + background: #5daee8; + color: #fff; } -.i-filterselect-nextpage-on, +.i-filterselect-nextpage, .i-filterselect-nextpage-off, .i-filterselect-prevpage-off, -.i-filterselect-prevpage-on, -.i-filterselect-status { +.i-filterselect-prevpage { + height: 11px; + background: transparent url(img/button-bg.png) no-repeat 50% 0; text-align: center; + margin: 2px 0 0 0; +} +.i-filterselect-prevpage { + background-position: 50% -1px; + margin: 0 0 2px 0; +} +.i-filterselect-prevpage:hover { + background-position: 50% bottom; } +.i-filterselect-nextpage:hover { + background-position: 50% -12px; +} +.i-filterselect-nextpage span, +.i-filterselect-prevpage span { + display: block; + height: 12px; + background: transparent url(img/arrow-up.png) no-repeat 50% 40%; + text-indent: -90000px; + cursor: pointer; +} +.i-filterselect-nextpage span { + background: transparent url(img/arrow-down.png) no-repeat 50% 60%; +} +.i-filterselect-nextpage-off, +.i-filterselect-prevpage-off { + background: transparent; +} +.i-filterselect-nextpage-off span, +.i-filterselect-prevpage-off span { + display: none; +} + .i-filterselect-nextpage-off, .i-filterselect-prevpage-off { color: #666; } +.i-filterselect-status { + position: absolute; + margin-left: 100%; + margin-top: -18px; + background: #b6bbbc; + color: #fff; + font-size: 11px; + line-height: 11px; + padding: 4px 6px; + height: 11px; + white-space: nowrap; +} + diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-down.png b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-down.png new file mode 100644 index 0000000000..ee795fd069 Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-down.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-up.png b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-up.png new file mode 100644 index 0000000000..055ad61ef1 Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-up.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-left-filter.png b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-left-filter.png index 2a11f324ca..58dae1d470 100644 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-left-filter.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-left-filter.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-right-filter.png b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-right-filter.png index c09d3632c2..04cb8e4089 100644 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-right-filter.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-right-filter.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/button-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/button-bg.png new file mode 100644 index 0000000000..9653ed949b Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/button-bg.png differ