From ba94b807d6ad1d6f236562fb83abd1f5e91ad5c3 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Fri, 24 Aug 2007 13:08:17 +0000 Subject: [PATCH] -New style for Panel, now supports "highlight" and "emphasize" styles also. -Some method names converted to comply GWT 1.4 naming. -TahSheet now supports Sizeable interface. svn changeset:2124/svn branch:trunk --- .../terminal/gwt/client/ui/IPanel.java | 21 +- .../terminal/gwt/client/ui/ISlider.java | 28 +- .../terminal/gwt/client/ui/ITabsheet.java | 23 +- .../component-themes/common/css/common.css | 8 +- .../component-themes/common/img/shadow-em.png | Bin 0 -> 152 bytes .../component-themes/common/img/shadow.png | Bin 0 -> 138 bytes .../common/img/window-bottom-bg.gif | Bin 20169 -> 19540 bytes .../component-themes/panel/css/panel.css | 310 +++++++++++++----- .../component-themes/panel/img/bg-em.gif | Bin 0 -> 169 bytes .../component-themes/panel/img/bg-light.png | Bin 0 -> 167 bytes .../panel/img/bottom-left-em.gif | Bin 0 -> 65 bytes .../panel/img/bottom-left-light.png | Bin 147 -> 147 bytes .../panel/img/bottom-left.png | Bin 147 -> 147 bytes .../panel/img/bottom-right-em.gif | Bin 0 -> 344 bytes .../panel/img/bottom-right-light.png | Bin 147 -> 147 bytes .../panel/img/bottom-right.png | Bin 147 -> 147 bytes .../component-themes/panel/img/top-bg-em.gif | Bin 0 -> 149 bytes .../panel/img/top-bg-highlight.png | Bin 0 -> 201 bytes .../panel/img/top-bg-strong.png | Bin 250 -> 244 bytes .../component-themes/panel/img/top-bg.png | Bin 162 -> 240 bytes .../panel/img/top-left-em.gif | Bin 0 -> 50 bytes .../panel/img/top-left-highlight.png | Bin 0 -> 248 bytes .../panel/img/top-left-light.png | Bin 170 -> 147 bytes .../panel/img/top-left-small.png | Bin 906 -> 147 bytes .../panel/img/top-left-strong.png | Bin 257 -> 296 bytes .../component-themes/panel/img/top-left.png | Bin 175 -> 264 bytes .../panel/img/top-right-em.gif | Bin 0 -> 50 bytes .../panel/img/top-right-highlight.png | Bin 0 -> 249 bytes .../panel/img/top-right-light.png | Bin 170 -> 147 bytes .../panel/img/top-right-small.png | Bin 906 -> 147 bytes .../panel/img/top-right-strong.png | Bin 257 -> 296 bytes .../component-themes/panel/img/top-right.png | Bin 919 -> 264 bytes .../component-themes/slider/css/slider.css | 10 +- .../tabsheet/css/tabsheet.css | 76 +++-- .../component-themes/tabsheet/img/tab-bg.png | Bin 225 -> 221 bytes .../tabsheet/img/tab-hover-bg.png | Bin 242 -> 0 bytes .../tabsheet/img/tab-hover-left.png | Bin 147 -> 0 bytes .../tabsheet/img/tab-hover-right.png | Bin 147 -> 0 bytes .../tabsheet/img/tab-left.png | Bin 147 -> 239 bytes .../tabsheet/img/tab-right.png | Bin 147 -> 240 bytes .../tabsheet/img/tab-selected-bg.png | Bin 162 -> 202 bytes .../tabsheet/img/tab-selected-left.png | Bin 175 -> 179 bytes .../tabsheet/img/tab-selected-right.png | Bin 175 -> 180 bytes src/com/itmill/toolkit/ui/TabSheet.java | 52 ++- 44 files changed, 396 insertions(+), 132 deletions(-) create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow-em.png create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow.png create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-em.gif create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-light.png create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-em.gif create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-em.gif create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-em.gif create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-highlight.png create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-em.gif create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-highlight.png create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-em.gif create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-highlight.png delete mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-bg.png delete mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-left.png delete mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-right.png diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java index 9118563107..3be27b2306 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java @@ -1,5 +1,7 @@ package com.itmill.toolkit.terminal.gwt.client.ui; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.SimplePanel; @@ -39,6 +41,10 @@ public class IPanel extends FlowPanel implements Paintable { // TODO optimize: if only the caption has changed, don't re-render whole content clear(); + // Remove shadow + Element deco = DOM.getChild(getElement(), 0); + if(deco != null) + DOM.removeChild(getElement(), deco); if(uidl.hasAttribute("style")) setStyleName(CLASSNAME + " " + CLASSNAME+"-"+uidl.getStringAttribute("style")); @@ -48,10 +54,13 @@ public class IPanel extends FlowPanel implements Paintable { // Handle caption displaying if(uidl.hasAttribute("caption") && !uidl.getStringAttribute("caption").equals("")) { caption.setText(uidl.getStringAttribute("caption")); + caption.setStyleName(CLASSNAME+"-caption"); + add(caption); + } else { + // Theme needs this to work around different paddings + caption.setStyleName(CLASSNAME+"-nocaption"); + caption.setText(""); add(caption); - } else if(uidl.hasAttribute("style")) { - // Theme needs this to work around different paddings - addStyleName(CLASSNAME+"-nocaption"); } // Size panel @@ -67,6 +76,7 @@ public class IPanel extends FlowPanel implements Paintable { setWidth(w>=0?w+widthUnit:"auto"); content.setHeight(h>=0?h+heightUnit:"auto"); + // Render content UIDL layoutUidl = uidl.getChildUIDL(0); Widget layout = client.getWidget(layoutUidl); ((Paintable)layout).updateFromUIDL(layoutUidl, client); @@ -74,6 +84,11 @@ public class IPanel extends FlowPanel implements Paintable { add(content); + // Add a decoration element for shadow + deco = DOM.createDiv(); + DOM.setElementProperty(deco, "className", CLASSNAME+"-deco"); + DOM.appendChild(getElement(), deco); + } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java index 458c65e6b7..78754e68c6 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java @@ -56,10 +56,10 @@ public class ISlider extends Widget implements Paintable { bigger = DOM.createDiv(); setStyleName(CLASSNAME); - DOM.setAttribute(base, "className", CLASSNAME+"-base"); - DOM.setAttribute(handle, "className", CLASSNAME+"-handle"); - DOM.setAttribute(smaller, "className", CLASSNAME+"-smaller"); - DOM.setAttribute(bigger, "className", CLASSNAME+"-bigger"); + DOM.setElementProperty(base, "className", CLASSNAME+"-base"); + DOM.setElementProperty(handle, "className", CLASSNAME+"-handle"); + DOM.setElementProperty(smaller, "className", CLASSNAME+"-smaller"); + DOM.setElementProperty(bigger, "className", CLASSNAME+"-bigger"); DOM.appendChild(getElement(), bigger); DOM.appendChild(getElement(), smaller); @@ -97,7 +97,7 @@ public class ISlider extends Widget implements Paintable { DOM.setStyleAttribute(smaller, "display", "block"); DOM.setStyleAttribute(bigger, "display", "block"); if(vertical) { - int arrowSize = Integer.parseInt(DOM.getAttribute(smaller, "offsetWidth")); + int arrowSize = Integer.parseInt(DOM.getElementProperty(smaller, "offsetWidth")); DOM.setStyleAttribute(bigger, "marginLeft", arrowSize+"px"); DOM.setStyleAttribute(bigger, "marginRight", arrowSize+"px"); } @@ -143,7 +143,7 @@ public class ISlider extends Widget implements Paintable { DOM.setStyleAttribute(getElement(), "width", size + "px"); else { Element p = DOM.getParent(getElement()); - if(Integer.parseInt(DOM.getAttribute(p, "offsetWidth")) > 50) + if(Integer.parseInt(DOM.getElementProperty(p, "offsetWidth")) > 50) DOM.setStyleAttribute(getElement(), "width", "auto"); else { // Set minimum of 50px width and adjust after all @@ -152,7 +152,7 @@ public class ISlider extends Widget implements Paintable { Timer adjust = new Timer() { public void run() { Element p = DOM.getParent(getElement()); - if(Integer.parseInt(DOM.getAttribute(p, "offsetWidth")) > 50) + if(Integer.parseInt(DOM.getElementProperty(p, "offsetWidth")) > 50) DOM.setStyleAttribute(getElement(), "width", "auto"); } }; @@ -173,12 +173,12 @@ public class ISlider extends Widget implements Paintable { if(vertical) { // TODO } else { - int t = Integer.parseInt(DOM.getAttribute(base, "offsetHeight")) - Integer.parseInt(DOM.getAttribute(handle, "offsetHeight")); + int t = Integer.parseInt(DOM.getElementProperty(base, "offsetHeight")) - Integer.parseInt(DOM.getElementProperty(handle, "offsetHeight")); DOM.setStyleAttribute(handle, "top", (t/2)+"px"); DOM.setStyleAttribute(handle, "left", "0px"); - int w = (int) (Double.parseDouble(DOM.getAttribute(base, "offsetWidth")) / 100 * handleSize); + int w = (int) (Double.parseDouble(DOM.getElementProperty(base, "offsetWidth")) / 100 * handleSize); if(handleSize == -1) { - int baseW = Integer.parseInt(DOM.getAttribute(base, "offsetWidth")); + int baseW = Integer.parseInt(DOM.getElementProperty(base, "offsetWidth")); double range = (max - min) * (resolution+1) * 3; w = (int) (baseW - range); } @@ -195,8 +195,8 @@ public class ISlider extends Widget implements Paintable { if(vertical) { // TODO } else { - int handleWidth = Integer.parseInt(DOM.getAttribute(handle, "offsetWidth")); - int baseWidth = Integer.parseInt(DOM.getAttribute(base, "offsetWidth")); + int handleWidth = Integer.parseInt(DOM.getElementProperty(handle, "offsetWidth")); + int baseWidth = Integer.parseInt(DOM.getElementProperty(base, "offsetWidth")); int range = baseWidth - handleWidth; double v = value.doubleValue(); double valueRange = max - min; @@ -341,9 +341,9 @@ public class ISlider extends Widget implements Paintable { if(vertical) { // TODO } else { - double handleW = Integer.parseInt(DOM.getAttribute(handle, "offsetWidth")); + double handleW = Integer.parseInt(DOM.getElementProperty(handle, "offsetWidth")); double baseX = DOM.getAbsoluteLeft(base) + handleW/2; - double baseW = Integer.parseInt(DOM.getAttribute(base, "offsetWidth")); + double baseW = Integer.parseInt(DOM.getElementProperty(base, "offsetWidth")); v = ((x-baseX)/(baseW-handleW)) * (max-min) + min; } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java index a62a140fb2..1ecddffc39 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java @@ -3,6 +3,8 @@ package com.itmill.toolkit.terminal.gwt.client.ui; import java.util.ArrayList; import java.util.Iterator; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.DeckPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.SourcesTabEvents; @@ -27,6 +29,8 @@ public class ITabsheet extends TabPanel implements Paintable { ArrayList captions = new ArrayList(); int activeTabIndex = 0; + + private Element deco; TabListener tl = new TabListener() { @@ -58,7 +62,7 @@ public class ITabsheet extends TabPanel implements Paintable { } }); - + } public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { @@ -71,6 +75,23 @@ public class ITabsheet extends TabPanel implements Paintable { TabBar tb = getTabBar(); tb.setStyleName(CLASSNAME+"-tabs"); + // Add a decoration element for shadow + // TODO refactor tabsheet with plain DIV-implementation + /*if(!DOM.compare(deco, null)) { + DOM.removeChild(DOM.getParent(getElement()), deco); + deco = null; + } + deco = DOM.createDiv(); + DOM.setElementProperty(deco, "className", CLASSNAME+"-deco"); + DOM.appendChild(DOM.getParent(getElement()), deco); + */ + // Adjust width and height + String h = uidl.hasAttribute("height")? uidl.getStringAttribute("height") : ""; + String w = uidl.hasAttribute("width")? uidl.getStringAttribute("width") : ""; + setWidth(w!=""?w:"auto"); + //DOM.setStyleAttribute(deco, "width", w!=""?w:"auto"); + dp.setHeight(h!=""?h:"auto"); + UIDL tabs = uidl.getChildUIDL(0); boolean keepCurrentTabs = tabKeys.size() == tabs.getNumberOfChildren(); for (int i = 0; keepCurrentTabs && i < tabKeys.size(); i++) diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css index f2769090a0..64c9177eb0 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css @@ -1,9 +1,9 @@ body { - background: #fafafc url(../img/window-bottom-bg.gif) no-repeat right bottom fixed; + background: #f5f6f7 url(../img/window-bottom-bg.gif) no-repeat right bottom fixed; font-family: helvetica, arial, tahoma, verdana, sans-serif; - color: #222; - font-size: 68.75%; - line-height: 1.4em; + color: #454a51; + font-size: 13px; + line-height: 19px; padding: 8px; margin: 0; } diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow-em.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow-em.png new file mode 100644 index 0000000000000000000000000000000000000000..a35c6b6b848d78ec65b143c75ee090a38c492c36 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrJ!2~4T^fnv@QY`6?zK#qG>ra@ocD)4hB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%X?eOhhE&{QkYRZIpW)cCV@zCJ yTnx8v-C}t9^eMyp_wO0LfB(+#_wQdO9)@EA0+HPFGCl%zF?hQAxvXra@ocD)4hB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%$#}XrhE&{2N=itWkjNyoUy#Lk hLIRUu!T}C}1O}%rW_g8Y681oK44$rjF6*2UngFy|BeMVi literal 0 HcmV?d00001 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bottom-bg.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bottom-bg.gif index 150e849d199b5889d781972218051463f36766f3..e8068d9a8be68f201581be275eefc13565ca752c 100644 GIT binary patch literal 19540 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 literal 20169 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 LlRe)fAOHY6J*uZE diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css index 41d230bdf1..1815c43ff0 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css @@ -1,101 +1,214 @@ .i-panel { - border: 1px solid #29528a; - padding: 5px 3px 2px 2px; - margin: 5px; + margin: 8px 0 1px 0; +} + +.i-panel-caption { + font-size: 12px; + line-height: 12px; + font-weight: normal; + color: #2c3c49; + white-space: nowrap; + height: 27px; + padding: 0 5px 0 5px; + border: 1px solid #c1c6cc; + border-bottom: none; background: #fff url(../img/top-bg.png) repeat-x top left; } -.i-panel:before { +.i-panel-caption:before { display: block; - height: 7px; + height: 28px; overflow: hidden; background: transparent url(../img/top-right.png) no-repeat right top; content: url(../img/top-left.png); - margin: -6px -4px 3px -3px; + margin: -1px -6px -20px -6px; +} + +.i-panel-content { + border: 1px solid #c1c6cc; + border-top: none; + background-color: #fff; + overflow: auto; + padding: 8px; } -.i-panel:after { +.i-panel-deco { + height: 9px; + background: transparent url(../../common/img/shadow.png) repeat-x left bottom; + margin-top: -2px; + position: relative; +} + +.i-panel-deco:before { display: block; height: 2px; overflow: hidden; background: transparent url(../img/bottom-right.png) no-repeat right top; content: url(../img/bottom-left.png); - margin: 2px -4px -3px -3px; } -.i-panel-caption { - font-size: 1.1em; - font-weight: bold; - color: #1c3e6e; - margin: 0 0 7px 4px; - overflow: hidden; +.i-panel-nocaption { + border-top: 1px solid #c1c6cc; + background-color: #fff; } -.i-panel-content { - overflow: auto; - padding: 3px; +.i-panel-nocaption:before { + display: block; + height: 2px; + overflow: hidden; + background: transparent url(../img/top-right-small.png) no-repeat right top; + content: url(../img/top-left-small.png); + margin-top: -1px; } /* Strong style */ -.i-panel-strong { + +.i-panel-strong .i-panel-caption { background-image: url(../img/top-bg-strong.png); + border-color: #6c9ad8; + color: #fff; + font-weight: bold; } -.i-panel-strong:before { - height: 28px; +.i-panel-strong .i-panel-caption:before { background-image: url(../img/top-right-strong.png); content: url(../img/top-left-strong.png); } -.i-panel-strong .i-panel-caption { - color: #fff; - margin: -25px 0 12px 4px; - white-space: nowrap; + + +/* Light style */ + +.i-panel-light .i-panel-caption { + background: transparent; + font-weight: bold; + border: none; + padding: 3px 0 0 2px; + height: 16px; + margin-bottom: 1px; + border-bottom: 1px solid #e7e7e8; } -/* Strong style without caption */ -.i-panel-strong.i-panel-nocaption { - background-image: url(../img/top-bg.png); +.i-panel-light .i-panel-caption:before { + display: none; } -.i-panel-strong.i-panel-nocaption:before { - height: 7px; - background-image: url(../img/top-right.png); - content: url(../img/top-left.png); + +.i-panel-light .i-panel-caption:after { + display: block; + height: 2px; + overflow: hidden; + background: transparent url(../img/top-right-light.png) no-repeat top right; + content: url(../img/top-left-light.png); + margin: 4px 0 0 -2px; } +.i-panel-light .i-panel-content { + border: 1px solid #e7e7e8; + border-top: none; + background: #fff url(../img/bg-light.png) repeat-x 0 1px; +} -/* Light style */ -.i-panel-light { - background-image: url(../img/top-bg-light.png); - border-color: #b3c2d6; - border-top-color: #2667a2; - margin-top: 20px; +.i-panel-light .i-panel-deco { + background: transparent; + height: 2px; +} + +.i-panel-light .i-panel-deco:before { + background: transparent url(../img/bottom-right-light.png) no-repeat top right; + content: url(../img/bottom-left-light.png); } -.i-panel-light:before { - height: 6px; +/* Light style without caption */ +.i-panel-light .i-panel-nocaption { + border-color: #e7e7e8; +} + +.i-panel-light .i-panel-nocaption:before { background-image: url(../img/top-right-light.png); content: url(../img/top-left-light.png); } -.i-panel-light:after { - background-image: url(../img/bottom-right-light.png); - content: url(../img/bottom-left-light.png); + + +/* Highlight style */ + +.i-panel-highlight .i-panel-caption { + background-image: url(../img/top-bg-highlight.png); + background-color: #fffdec; + border-color: #c0baae; + color: #4e4640; } -.i-panel-light .i-panel-caption { - margin: -26px -2px 10px -2px; - font-size: 1em; - white-space: nowrap; +.i-panel-highlight .i-panel-caption:before { + background-image: url(../img/top-right-highlight.png); + content: url(../img/top-left-highlight.png); } -/* Light style without caption */ -.i-panel-light.i-panel-nocaption { - margin-top: 7px; +.i-panel-highlight .i-panel-content { + background-color: #fffdec; + border-color: #c0baae; + color: #605b52; +} + +/* Highlight style without caption */ +.i-panel-highlight .i-panel-nocaption { + border-color: #c0baae; + background-color: #fffdec; +} + + + +/* Emphasized style */ + +.i-panel-emphasize .i-panel-caption { + background: #6899d9 url(../img/top-bg-em.gif) repeat-x; + border-color: #78a2db; + color: #fff; + font-weight: bold; + height: 22px; } +.i-panel-emphasize .i-panel-caption:before { + background-image: url(../img/top-right-em.gif); + content: url(../img/top-left-em.gif); +} + +.i-panel-emphasize .i-panel-content { + background: #3a6bab url(../img/bg-em.gif) repeat-x; + color: #dee6f2; + border-color: #78a2db; +} + +.i-panel-emphasize .i-panel-deco { + margin-top: -4px; + height: 11px; + background-image: url(../../common/img/shadow-em.png); +} + +.i-panel-emphasize .i-panel-deco:before { + background-image: url(../img/bottom-right-em.gif); + content: url(../img/bottom-left-em.gif); + height: 4px; +} + +/* Emphasized style without caption */ +.i-panel-emphasize .i-panel-nocaption { + background: #6899d9 url(../img/top-bg-em.gif) repeat-x; + border: 1px solid #78a2db; + border-bottom: none; + height: 3px; +} + +.i-panel-emphasize .i-panel-nocaption:before { + background-image: url(../img/top-right-em.gif); + content: url(../img/top-left-em.gif); + margin: -1px; +} + + + @@ -104,41 +217,90 @@ * These selectors must be separate because IE6 won't * apply them if they are grouped together. */ -* html .i-panel { - zoom: 1; +* html .i-panel-caption { + padding-top: 7px; + height: 19px; } -*+html .i-panel { - zoom: 1; +*+html .i-panel-caption { + padding-top: 7px; + height: 19px; } -* html .i-panel .i-panel-caption { - margin-top: 3px; + +* html .i-panel-deco { + position: static; + background: transparent; + margin: 0; + font-size: 1; + height: 7px; + overflow: hidden; + /* TODO change url when packaging is complete */ + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow.png", sizingMethod="scale"); } -*+html .i-panel .i-panel-caption { - margin-top: 3px; + +/* Without caption */ +* html .i-panel-nocaption { + height: 1px; + overflow: hidden; + background: #c1c6cc; + border: none; } -* html .i-panel-strong .i-panel-caption { - margin: 0 0 10px 4px; +/* Light style */ + +* html .i-panel-light .i-panel-caption { + background: transparent; + font-weight: bold; + border: none; + padding: 3px 0 0 2px; + height: 16px; } -*+html .i-panel-strong .i-panel-caption { - margin: 1px 0 10px 4px; +*+html .i-panel-light .i-panel-caption { + background: transparent; + font-weight: bold; + border: none; + padding: 3px 0 0 2px; + height: 16px; } -* html .i-panel-light { - margin-top: 5px; +* html .i-panel-light .i-panel-content { + border: 1px solid #e7e7e8; + background-position: 0 2px; } -*+html .i-panel-light { - margin-top: 23px; +*+html .i-panel-light .i-panel-content { + border: 1px solid #e7e7e8; + background-position: 0 2px; } -* html .i-panel-light .i-panel-caption { - margin-left: 4px; - margin-bottom: 5px; - padding-bottom: 0; + +* html .i-panel-light .i-panel-deco { + display: none; } -*+html .i-panel-light .i-panel-caption { - /*margin-left: 4px; - margin-bottom: 5px; - padding-bottom: 0;*/ - margin-top: -23px; + +/* Without caption */ +* html .i-panel-light .i-panel-nocaption { + display: none; +} +*+html .i-panel-light .i-panel-nocaption { + display: none; +} + + +/* Emphasized style */ +* html .i-panel-emphasize .i-panel-caption { + height: 15px; +} +*+html .i-panel-emphasize .i-panel-caption { + height: 15px; +} + +* html .i-panel-emphasize .i-panel-content { + background-attachment: fixed; +} + +* html .i-panel-emphasize .i-panel-deco { + height: 7px; + margin-top: 0; + background: transparent; + /* TODO change url when packaging is complete */ + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow-em.png", sizingMethod="scale"); } \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-em.gif new file mode 100644 index 0000000000000000000000000000000000000000..1c817bfa54dc37f7488b7ccc7b9a61bd9c14c92f GIT binary patch literal 169 zcmZ?wbhEHbWMpt)IKsf-RJ_@%dbfMUj=-ivLCuFlT91ad9dj+)=2N@ZzF>o6(I&U@ z?VeS;f?JOGHyrS*-|teo)w^boN9E3d#)A%p8-45c+2pQuF4-qStL)Vb zNI>x?3z(+^B0+XCu&ONxG&y46doDQCLxira@ocD)4hB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%2?h9sxc>hA`_G?0fB*jd_wV2T z|Nnpe`o&OikQ*o~?djqeQgJIOAyt8G5wn}gi59k*8y&<_I0O1H|fN32N2~x|z%oY(6 K#H`53U=09m4i6~+ literal 0 HcmV?d00001 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-light.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-light.png index 9312e5bc03ed89e3d3d3ee0c3c3ec2c95684debd..91e395dd4a3a2a7db3949b4f4f72a97f98cc8161 100644 GIT binary patch delta 60 zcmbQtIGJ%moax7pAOHXV|NQw2fde~285kG@JY5_^DsCkuBqb!IFmV_#Fo-a)Ewovu Q0hD9#boFyt=akR{05RDXbN~PV delta 60 zcmbQtIGJ%moayF6*IvH;eEIhCC98{bP0l+XkKB(D~* diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left.png index 3fda5f3c516e98116c368c2332dbfef210dc3dbe..9ce9c8efe9810682aa4fa3bc367dd771c83880ad 100644 GIT binary patch delta 60 zcmbQtIGJ%moaybm4{zPRbMV-i$&Y*e7#J7?JY5_^DsCkuBqb!IFmV_#Fo-a)Ewovu Q0hD9#boFyt=akR{029F#-v9sr delta 60 zcmbQtIGJ%moT+9|*O7B~8fWhE_3A2MU|HZri O$KdJe=d#Wzp$PzqzY})= diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-em.gif new file mode 100644 index 0000000000000000000000000000000000000000..1ffd8658cb83c1e52f3703e11af6343f4d5ce8c1 GIT binary patch literal 344 zcmZ?wbhEHbJi)=ju$h6OV$tpBuHzvsho&yu<6N@YyJk=Nj2l+jtNm(sF<=9VKUu)S zIv^5c1_R6g4<|fV@3nY+cK81TjlPu3c^RwL<-FckpmV+?_kP8?_cibTA6QV}p(E9Q zVoA}-9IN>kR+P9gh^)J@rtI|Fs{Ic(RQTx4KL27%)!Dq=_do2Y@mqiU{f|9$=imSS z-_Y39+|t_C-qG3B-P7CGKVjme$y26In_j`lz&2;@y!i_jE?T@~>9XZ3R<2sTX6?H5 z8#Zp*yk+aQ?K^hv+P!D*zWoOd9y)yF=&|D`PM$h_=Ipui7cO49eC6u3>o;!Rx_xIa z69dP?M~|O8efIpt%U7@8ynXln!^cmbzkL1n{m0K=zyJLG_n(28OU7fvf`iQ*!dfvW lHY_~cE}-l+$7AE7qumn5S$9rsTztG=fz_E$Mu3sQ8UWR*xTgRB literal 0 HcmV?d00001 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-light.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-light.png index c542a426290140e66cff699f349e3409661552f0..31e6252f909121e680f3ac8b418090ee806f2ed0 100644 GIT binary patch delta 60 zcmbQtIGJ%moax7pAOHXV|NQw2fde~285kG@JY5_^DsCkuBqSvyv2YkLFbFfSEe(AC Q4=Bgr>FVdQ&MBb@070o2qW}N^ delta 60 zcmbQtIGJ%moayF6*IvH;eEIhCC98{aZVBs)eU=UFVdQ&MBb@03(qX4gdfE delta 60 zcmbQtIGJ%moT+9|*O7B~8fWhE_3A2MU|gTe~DWM4fhX@li diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-em.gif new file mode 100644 index 0000000000000000000000000000000000000000..57a3d6a4cf35e9a0eed517339a362f6860b7d558 GIT binary patch literal 149 zcmZ?wbhEHbWMmLyIKse?G4p2Pq)Xu)Csy42U%KpBMCZw(#g9YVj>S*75Yu}$vg=gZ z^y^{m$CIaADOmV0ciz4B9Y3;W-;V7&7u9{5fe4`ZlLf3w2SkGGWMCC~z#!Q6+2z0` QmJSuw%S%LY7Ai(^Q|t&~&S1sN0s7!=Mt wyjvgl);6leAjR7~RONQfx%B;_w?q>dL`oSRtkAj}0o23b>FVdQ&MBb@07UOr?EnA( literal 0 HcmV?d00001 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-strong.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-strong.png index 5b89dd68c26377950f91978078a3fbb6a1ee53c0..8385dced7de2330a6e8cbc1f9d158b4e84ce11f0 100644 GIT binary patch delta 177 zcmV;i08an<0rUZo7YZ5(0{{R3LE6USks&yLNKi~vMP!xLVUp5lnb}&4%U6iVP=Ud= z=ka^2>{yA(a--u_hQ@!e@Nb~tUy#sjo!xn=>RgS@X`0%0r{`vu*KC^Dkiqd&gv3#T z!YUk*+W-InGD$>1RCwA9#m5nVAOHZcU`H${sQYg!mq$z<$?SBCHit_=u*-Uj!RqxK fHDkL|e*p#nAFBaEyxr(x00000NkvXXu0mjfEp}5q delta 183 zcmV;o07(Dz0r~-u7YZ8)0{{R3iiQl} lwa%oH?0${W=@vc#1^^~w0Y=CHSwsK;002ovPDHLkV1h1pN*MqE diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg.png index bdfca2710738db514a19e0cb146f64a325e703fb..8a2914625710e58e6f80c9b352e4cafbe5c3dc50 100644 GIT binary patch delta 173 zcmV;e08;;=0q_Bk7YZ5(0{{R3LE6USks&yLMNmvsMc3Wq^Y!=E+~d{U;@aWn+~Vio z<>}bo)7Aq-sI`o-{srk=Hce+u;NA>DB%C6N}5zqJd!M0oLC#5QQ<|d}62BjvZR2H60wE-%!3GfMVy?68co$F`*|9$iF`NOk^ zwmrFj{^PqR|Nnmf^Xtq1|G)nJ{`&9FxBvfs{Qv*^*N;#C|Ns2`^Yeco_5I_4UF+(( zw#@^Yx8d~{nkYif$vv{Jh43` uxwOT}A$h^IZCn3E=IdA67u-FreSkrnjg|S)Zs{Qv*|^XD%F4(td8N(y+oIEGZ* iN=iscN=RbhFkoO1XJAtmDOwJcWAJqKb6Mw<&;$THHyP>x delta 102 zcmV-s0Ga=j0jdFz7YYUl0{{R3-ub@(ks&xy6;Mo6MJ8vWc$vs^mBiNF?6k$?owwnU zt=TeEYK{N^02@g}K~#9!1i^s;000C7pcwu?SqYluDCPwi006@P7XGGJ2LJ#707*qo IM6N<$g2*o=VgLXD diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-small.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-small.png index 64c0c5c91c6d00f662c570229b5a111d5410d618..047d62d054c73c434ba26de311e779f517014cea 100644 GIT binary patch delta 66 zcmeBTpUgNR!kU3Iz$e7@_T7i~AHO(w?2N8igAW4(gMg=tV@SoVq=b~Dgd_$I0|o|h V1~yfZqUAt222WQ%mvv4FO#m|56|(>U delta 831 zcmV-F1Hk-~0g4BZSbqZmP)t-sDN>5W&fI~Sx&s3P1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+D1Rs@DJdx`Dk>{0D=aK5 zEiElBE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`> zK0ZG`KR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJox zPf$=$QBhG+Qh!oYQ&Ut_R8>_~R#sM5S65hASXo(FT3T9LTU%UQTwPsVUS3{bUteHg zU}0flVq#)rV`F4wWMyS#W@ct*XJ=?=XlZF_YHDh0Yin$5Y;A3AZfQ za&mHWb8~cbbai!gc6N4mcXxPrczJnwdU|?$dwYC*e1Cm?eSUs^e}8{~fPjI4fr5g9 zgM)*FgoK5Kg@%TPhlhuVh=_@aiHeGfi;IhljEs$qjgF3vkB^U#kdTp)k&=>dCU z$jHda$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(SOm>($dq@)6~?|)z#J3*4Ee8*Vx$D z+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd} z>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6a zR7FsM!F#OiWR=yB!SPy)%U6iVVUp5Pg~$K@|F-Ax-{a`K%H3_Z#;mr(lB2g+iOF)K z<5h;nf3Waxpx|GS&}^OEd8+DMjm>GA+IFYsUXamdm)BE-#8HC6Y?|0}%%+t9002=* zL_t(|+9by{0)RjOz_8*DhkO73P)r7f453zRD@+ocCX6E7Hat%Z0p}Ul6^{e&8{-)B z9G3<69n%zt0kaIp5uXR&_Xq!ri~f?XDL(-Q0C}|r&7<>A6#xJL07*qoM6N<$f_40H Aga7~l delta 211 zcmV;^04)Eg0)YY{iBL{Q4GJ0x0000DNk~Le000020000S2m=5B0DQEb{gEL!e^F3O zR7ELLiaKMPQF^jJXrMl4pGEGk&+27^p z?C;v)=Hln;+Ti8a-sIut>($!a}tz=-A%m)!gFT;^*Jv=-A)n;N|Mq-Q(Tj z=hofh!N$zp%?^eD002NqL_t(|+8oMB4uBv4z`(lVuBf2>|3@_>Jdv7*cVI@ A`Tzg` literal 0 HcmV?d00001 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-highlight.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..58f0127cc973c9661923493f522057e9bd3a61d7 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!|0U{@teLW1MSkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%!3GfMVy?68co$F`*|9$iF`NOk^ zwmrFj{^PqR|Nnmf^Xtq1|G)nJ{`&9FxBvfs{Qv*^*N;#C|Ns2`^Yeco_5I_4UF+(( zw#@^Ys{Qv*|^XD%F4(td8N(y+oIEGZ* iN=isdNl0MgFkoO1V_@^|jW_|6WAJqKb6Mw<&;$TR7#foR delta 102 zcmV-s0Ga=j0jdFz7YYUl0{{R3-ub@(ks&xy6;Mo6MJ8vWc$vs^mBiNF?6k$?owwnU zt=TeEYK{N^02@g}K~#9!1i^s;000C7pcwu?SrN^06ypUL007be78^lh*8l(j07*qo IM6N<$g1EpWwg3PC diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-small.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-small.png index 8ba960b21097c907c8962332bda52a53d4da1461..a19338806f849b372cde9b77d159ec00f5a5d4ba 100644 GIT binary patch delta 66 zcmeBTpUgNR!kU3Iz$e7@_T7i~AHO(w?2N8igAW4(gMg=tV@SoVq=clDgajrI0|o{$ V1~&iRh!a3L22WQ%mvv4FO#nQ*7F+-T delta 831 zcmV-F1Hk-~0g4BZSbqZmP)t-sDN>5W&fI~Sx&s3P1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+D1Rs@DJdx`Dk>{0D=aK5 zEiElBE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`> zK0ZG`KR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJox zPf$=$QBhG+Qh!oYQ&Ut_R8>_~R#sM5S65hASXo(FT3T9LTU%UQTwPsVUS3{bUteHg zU}0flVq#)rV`F4wWMyS#W@ct*XJ=?=XlZF_YHDh0Yin$5Y;A3AZfQ za&mHWb8~cbbai!gc6N4mcXxPrczJnwdU|?$dwYC*e1Cm?eSUs^e}8{~fPjI4fr5g9 zgM)*FgoK5Kg@%TPhlhuVh=_@aiHeGfi;IhljEs$qjgF3vkB^U#kdTp)k&=>dCU z$jHda$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(SOm>($dq@)6~?|)z#J3*4Ee8*Vx$D z+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd} z>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6a zR7FsM!F#OiWR=yB!SPy)%U6iVVUp5Pg~$K@|F-Ax-{a`K%H3_Z#;mr(lB2g+iOF)K z<5h;nf3Waxpx|GS&}^OEd8+DMjm>GA+IFYsUXamdm)BE-#8HC6Y?|0}%%+t9002=* zL_t(|+9by{0)RjOz_8*DhkO73P)r7f3_)wER+2=fNuo%$P0mw7ka?DMmE(~6mN=F? zmt~QCmo$}OkSvpNl;@H6{lWjM5U-xH={^Al0C!mi&AzuL5dZ)H07*qoM6N<$f}1UN A@Bjb+ delta 211 zcmV;^04)Eg0)YY{iBL{Q4GJ0x0000DNk~Le000020000S2m=5B0DQEb{gEL!e^F3O zR7ELLiaKMPQF^jJXrMl4pGM**a-Yd7zyLsV0bxzC`HBDl N002ovPDHLkV1h~;QcnN? diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right.png index dcf9c5c0dc7e4b003c43dedefa7dafdf6dfff074..a9261fea2296d9d26138f64f3684f7b23817f9a3 100644 GIT binary patch delta 198 zcmV;%06G7c2Z#cY7YZB*0{{R3e6*hZks&vK08UU$R7Kn2=GNTf&ePi7Dk}q z=;pXD!>)PPu*WTpe=Ihnk+~er%-{tAv zC@3i@DJm)|D=RB3EG#W8EiNuDFE1}JFfcJOF)}hTGcz+ZG&D6eH8wUjH#avpI5;^u zIXXHzJ3Bi(JUl%;Jw84@KR-V}KtMr3K|(@8LqkJEL_|eJMMg$OM@L6UNJvRZNlHpe zOG`^kOiWEpO-@cuPft%!P*71(QBqQWQd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cIN zTwGjTU0q&YUSD5dU|?WjVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8 zZEbFDZf|dIaBy&OadC2Ta&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R=eSLj? zetv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%XiHV7dii(Sii;Rqnjg5_tj*gFy zkC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-Cf>sHv%`s;a81tE;T6tgWrBuCA`HudlGMu(7eR zva+(Xv$M3cw6(Rhwzjsnx3{>sxVgExy1Kf%ySu!+yuH1>zP`S{zrVo1z`?=6!otGC z!^6bH#KpzM#>U3S$H&OX$jQmc%F4>i%gfBn%+1Zs&d$!y&(F}%(9zL<(bCe=)6>(` z)YR40)z;S5*VotB*x1?G+1lFL+uPgR+}z#W-QM2b-{0Th;Naom;o{=ruz*=jZ3>=;-O`>FVn0>+9?6?CkCB?e6aG@9*#M@bK~R@$&NW^Yioc^z`-h_4fAm z_xJbs`1twx`TF|$`}_Mv{QUg={r&#_{{R2~P2on$0000TNklR07*qoM6N<$f`AsI7ytkO diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css index a11ec6e3f4..c7c4f665bd 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css @@ -28,14 +28,20 @@ .i-slider-base { background: #c3d0dd url(../img/bg.png) repeat-x; height: 14px; - margin: 0 1px; overflow: hidden; } .i-slider-handle { background: #fff url(../img/handle-bg.png) repeat-x; border: 1px solid #29528a; height: 10px; - overflow: hidden; + font-size: 1px; +} +.i-slider-handle:before { + display: block; + height: 12px; + background: transparent url(../img/handle-right.png) no-repeat right top; + margin: -1px -1px 0 -1px; + content: url(../img/handle-left.png); } .i-slider-bigger { background: #dde4ef url(../img/arrow-right.png); diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css index fb8750b028..682817d4f6 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css @@ -1,5 +1,5 @@ .i-tabsheet { - margin: 5px; + } .i-tabsheet-tabs { @@ -12,80 +12,75 @@ } .i-tabsheet-tabs .gwt-TabBarRest { - border-bottom: solid 1px #29528a; + border-bottom: solid 1px #c1c6cc; } .i-tabsheet-tabs .gwt-TabBarItem { - border: solid 1px #6082b0; - border-bottom-color: #29528a; - height: 17px; - padding: 4px 8px; - color: #1c3e6e; - background: #e6ebf0 url(../img/tab-bg.png) repeat-x; + border: solid 1px #9cacb9; + border-bottom-color: #c1c6cc; + height: 18px; + padding: 4px 25px; + color: #2c3c49; + font-size: 12px; + background: #ecf0f4 url(../img/tab-bg.png) repeat-x; margin-right: 1px; cursor: pointer; } .i-tabsheet-tabs .gwt-TabBarItem-selected { - border-color: #29528a; + border-color: #c1c6cc; border-bottom-color: #fff; background: #fff url(../img/tab-selected-bg.png) repeat-x; padding-top: 7px; padding-bottom: 5px; margin-bottom: -1px; - font-weight: bold; cursor: default; } .i-tabsheet-tabs .gwt-TabBarItem:hover { - border-color: #29528a; - background: #3a639b url(../img/tab-hover-bg.png) repeat-x; - color: #fff; + color: #62788a; } .i-tabsheet-tabs .gwt-TabBarItem-selected:hover { - background: #fff url(../img/tab-selected-bg.png) repeat-x; - color: #1c3e6e; + color: #2c3c49; } -/* Rounded corners effects */ .i-tabsheet-tabs .gwt-TabBarItem:before { display: block; height: 2px; overflow: hidden; background: transparent url(../img/tab-right.png) no-repeat right top; content: url(../img/tab-left.png); - margin: -5px -9px 3px -9px; + margin: -5px -26px 3px -26px; } .i-tabsheet-tabs .gwt-TabBarItem-selected:before { - height: 7px; + height: 27px; background-image: url(../img/tab-selected-right.png); content: url(../img/tab-selected-left.png); - margin: -8px -9px 0 -9px; + margin: -8px -26px -20px -26px; } -.i-tabsheet-tabs .gwt-TabBarItem:hover:before { - background-image: url(../img/tab-hover-right.png); - content: url(../img/tab-hover-left.png); +.i-tabsheet-content { + background-color: #fff; + border: solid 1px #c1c6cc; + border-top: none; + padding: 8px; } -.i-tabsheet-content:after { +.i-tabsheet-deco { + height: 9px; + background: transparent url(../../common/img/shadow.png) repeat-x left bottom; + margin: -2px 0 0 1px; + position: relative; +} + +.i-tabsheet-deco:before { display: block; height: 2px; overflow: hidden; background: transparent url(../../panel/img/bottom-right.png) no-repeat right top; content: url(../../panel/img/bottom-left.png); - margin: 5px -6px -6px -6px; -} - - - -.i-tabsheet-content { - background-color: #fff; - border: solid 1px #29528a; - border-top: none; - padding: 5px; } /* Fix Safari bug (one pixel table offset) */ @@ -97,4 +92,19 @@ width: 1px; height: 1px; overflow: hidden; +} + + + + +/* IE specific styles */ +* html .i-tabsheet-deco { + position: static; + background: transparent; + margin-top: 0; + font-size: 1; + height: 7px; + overflow: hidden; + /* TODO change url when packaging is complete */ + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow.png", sizingMethod="scale"); } \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-bg.png index dc89d4119e167f26417e0a51765a90e71ea9862f..aef042a41e5847aa5dbcde1800857ab62ddbcee2 100644 GIT binary patch delta 154 zcmV;L0A>H-0o?(R7YZ5(0{{R3LE6USks&yLHc(7dMeXtQ>+kd9=IQJ3^X%~S^Y-}Y z?egmH^X&2T?eX>N@bv2M^5f;^=k3I$Xcv4nwucPP>L~g(ob@`~(;P8yW!-*@)r`00000NkvWt IM6N<$f~nM2MgRZ+ delta 158 zcmV;P0Ac^#0pS6V7YZ2&0{{R3$4<0Oks&yLIZ#YgMfdsp`1<_+|Nrsy`1AJp`~3a% z_xZcT(9P7|`TG3t^Y`-g`1JSs@bvff`1ra@ocD)2imbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-&f2=EDUwMw4tnzt;lYE$dFXO>B` z95NUBl&^f~!8Kd_%GWz( zFAlBS=9a(wVr{%U&`bkQ7srr_TOtQJg&Y(Z7!E955p(kA|M^n8o17=Em0SMGC~MO7 lH)c0<%_hfRd1=qc#vtFpD5`k6(EzBI!PC{xWt~$(69C7#R;vI2 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-left.png deleted file mode 100644 index 0ee9612f8f7895dcd849d68143a83bac6a182861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^Od!m`3?yAM{)z!9mUKs7M+S!VC(K#9UIO`&C9V-A z!TD(=<%vb942~)JNvR5+xryniL8*x;m4zo$ZGeh61AIbUHG{ewvldQYbLwl9k_%8! oz|+Msq~camLQ+CP0t<%$1A`y~%cZK&6rdb~r>mdKI;Vst03a|Y1poj5 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-right.png deleted file mode 100644 index e05b830e05fa2ddb60c1383e5955e7ed9d523054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^Od!m`3?yAM{)z!9mUKs7M+S!VC(K#9UIO`&C9V-A z!TD(=<%vb942~)JNvR5+xryniL8*x;m4zo$ZGeh61AIbUHG{ewvldQYbLwl9k_%8! nz|+Msq~camLPAnP3Im4$P=tYHpQrn8pd5pztDnm{r-UW|BIhSa diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-left.png index b0ceef078eed3482374d68a8da1c2de5d2274372..a3f43bc7e5c0d7b6e6bd5a0f8d3f575d62280746 100644 GIT binary patch delta 193 zcmV;y06zbd0q+4JiBL{Q4GJ0x0000DNk~Le000030000R2m=5B0FHCTdyyeHe?L%6 zR7Ldn`SJ4f^!NDo_xPi-zQxYf#Ld;m(AT81zxMd~F!NeM{_2?;D51`G^>3@n$bLQ{Zp44$rjF6*2Ung9=B8~FeL diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-right.png index 1461c8f6320099dc5959c245f3b85519e4eba9da..59c71623053281be9b40f49b91cfa24f1ca4a636 100644 GIT binary patch delta 194 zcmV;z06qVc0q_AKiBL{Q4GJ0x0000DNk~Le000030000R2m=5B0FHCTdyyeHe?L%6 zR7Ldn`SJ4f^!NDo_xPi-zQxYf#Ld;m(AT81zxMd~~wV*w=01jGzL wEQp4=ftVABh0rh`5(e=ZftX7~7#JYH01LncJ6bX>y#N3J07*qoM6N<$f&$WB{r~^~ delta 100 zcmeysIGItgGr-TCmrII^fq{Y7)59eQNHc*j2Q!d#&G;)eQPIMRGr%XrHKA$4-jlaC wAG+~+^S+rtNdZq6$B>F!NeKx_2`LO520#%8mVKV?zkzZLp00i_>zopr01|v0Jpcdz diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-bg.png index bdfca2710738db514a19e0cb146f64a325e703fb..4c04dee4aa575b5e14616171b26a5d8175886e70 100644 GIT binary patch delta 134 zcmZ3)c#3g?IF~F3GXn!d%>8fC6BR8A)dPG&T>t#}`{U>DKYxMXABg(*@AvON|Nj5~ z`Rn(;fB$~{{`2G4@Bjb*KYJas3aC}n)5S5Q;#SV#cHRRDJPZcGW>5ZCpJbexsu-iH mug=Rmf7R{Gu6q9lMh0mUM$UJ?i=%;>7(8A5T-G@yGywp1K}K)@ delta 94 zcmX@bxQKCrI2RiSGXn#I={XkWiHa7ULIFM@t^t)BBN})9|Nq}9d$DKHs@i4u+Vzi5 x0;&@8ba4!+xRsQUnvjx^kdT;=mcYbez`&5rAh2VJ{cE5K22WQ%mvv4FO#t6FAIty% diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-left.png index 114655614b6ffedb00315f3fae5a428276f318bd..12bdc0ab031b4e4ac107fc2f7323a2252b8b7f4e 100644 GIT binary patch delta 132 zcmZ3_xS3J0Gr-TCmrII^fq{Y7)59eQNHYVmEC+~;&{9jAsAv%-7vK}(dhGOtn|B`k z`t|$guU|KA-#>cl!kzn%zI^?5@YtFE|Nqap>Td?rA?@kn7*cU7DIq;EAt5C>Eg|($ h%7X_>xY;-i7-rToosv=2Pz5Su@O1TaS?83{1OVfKG}Hh9 delta 128 zcmdnYxSmn5Gr-TCmrII^fq{Y7)59eQNHYO3I|nn66kVFLbfTg~m_&e2h^uB$S3u=P zr|iXfJ=-=PxE#^A)3a!mea8HK`6u*%YGplL978H@u^eP&WMJT6Ph($ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-right.png index 9f47da4d812259d27fb11f7d8a50aa2a2cf44a70..828f62b8e51e8cab0467775a61a0922bc9370b27 100644 GIT binary patch delta 133 zcmZ3_xP?)%Gr-TCmrII^fq{Y7)59eQNHYVmEC+~;&{9jAsAv%_7vK}(dhGOtn|B`k z`t|$guU|KA-#>cl!kzn%zI^?5@YtFE|Nqap>Td?rA>--d7*cU7DIp;-Js~YQVqdw7O=B%7% 0) { + target.addAttribute("width", width + UNIT_SYMBOLS[widthUnit]); + } else { + target.addAttribute("width", "100%"); + } + if(height > 0) { + target.addAttribute("height", height + UNIT_SYMBOLS[widthUnit]); + } target.startTag("tabs"); @@ -483,4 +501,36 @@ public class TabSheet extends AbstractComponentContainer { protected void fireSelectedTabChange() { fireEvent(new SelectedTabChangeEvent(this)); } + + public int getHeight() { + return height; + } + + public int getHeightUnits() { + return heightUnit; + } + + public int getWidth() { + return width; + } + + public int getWidthUnits() { + return widthUnit; + } + + public void setHeight(int height) { + this.height = height; + } + + public void setHeightUnits(int units) { + this.heightUnit = units; + } + + public void setWidth(int width) { + this.width = width; + } + + public void setWidthUnits(int units) { + this.widthUnit = units; + } } -- 2.39.5