Fixes IWindow height calculation (one extra pixel because of top border on content...

New TabSheet style: "light" (no constant yet in TabSheet.java).

Changed Table row selection color to match general selection color in default theme (blue).

svn changeset:6068/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index f9c0ae7f87b880442f98570a7f179c804dcb1f03..dd4334989b336d841586eaa78c58e7fd4e882fe0 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -1759,8 +1759,8 @@ input.i-modified,
        background-color: #edeeee;
 }
 .i-table .i-selected {
-       background: #d5dde0;
-       color: #456572;
+       background: #57a7ed;
+       color: #fff;
 }
 .i-table-row td,
 .i-table-row-odd td {
@@ -1775,7 +1775,7 @@ input.i-modified,
 }
 
 /* Fix textfield size to correspond label size inside table */
-.i-table-cell-content input.i-textfield,
+.i-table-cell-content .i-textfield,
 .i-table-cell-content .i-button {
        margin: -2px 0 -2px -3px;
 }
@@ -2114,6 +2114,176 @@ input.i-modified,
        margin: 0;
        width: 100%;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* Inline style */
+
+.i-tabsheet-light .i-tabsheet-tabcontainer {
+       height: 32px;
+}
+
+.i-tabsheet-tabs-light {
+       height: 32px;
+       width: 100%;
+       overflow:hidden;
+       background: transparent url(tabsheet/img/inline-tab-bg.png) repeat-x;
+}
+
+.i-tabsheet-light .i-tabsheet-spacertd div {
+       height: 31px;
+       border: none;
+       border-bottom: 1px solid #b6bbbc;
+       background: transparent;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem {
+       border: none;
+       border-bottom: 1px solid #b6bbbc;
+       height: 30px;
+       padding: 0;
+       margin-top: 0;
+       color: #656d73;
+       font-size: 12px;
+       line-height: normal;
+       background: transparent;
+       cursor: pointer;
+       text-shadow: #fff 0 1px 0;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitemcell-first .i-caption {
+       margin-left: 6px;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem .i-caption {
+       height: 24px;
+       padding: 8px 9px 0 9px;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem-selected {
+       border: none;
+       background: #fff url(tabsheet/img/inline-tab-right.png) no-repeat right top;
+       margin: 0;
+       padding: 0;
+       height: 32px;
+       cursor: default;
+       color: #ee5311;
+       text-shadow: none;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem:hover {
+       color: #4b5257;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem-selected:hover {
+       color: #ee5311;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
+       background: transparent url(tabsheet/img/inline-tab-left.png) no-repeat -7px 0;
+       margin: 0;
+       height: 23px;
+       padding: 9px 11px 0 11px;
+       overflow: visible;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitemcell-first .i-tabsheet-tabitem-selected .i-caption {
+       background: transparent url(tabsheet/img/inline-tab-left.png) no-repeat -3px 0;
+       padding-left: 15px;
+}
+
+.i-tabsheet-light .i-tabsheet-content {
+       border: none;
+       background: transparent;
+}
+
+.i-tabsheet-light .i-tabsheet-hidetabs .i-tabsheet-content {
+       border: none;
+}
+
+.i-tabsheet-deco-light {
+       height: 0;
+       overflow: hidden;
+}
+
+.i-tabsheet-deco-light:before {
+       display: none;
+}
+
+
+/* Scroller */
+
+.i-tabsheet-light .i-tabsheet-scrollerPrev,
+.i-tabsheet-light .i-tabsheet-scrollerNext {
+       margin-top: 2px;
+       height: 34px;
+}
+.i-tabsheet-light .i-tabsheet-scrollerPrev-disabled,
+.i-tabsheet-light .i-tabsheet-scrollerNext-disabled {
+       margin-top: 2px;
+       height: 34px;
+}
+
+
+
+
+/* Progress indication */
+
+.i-tabsheet-loading .i-tabsheet-tabs-light .i-tabsheet-tabitem-selected .i-captiontext {
+       margin-left: -3px;
+       padding-left: 3px;
+}
+
+
+
+/* IE specific styles */
+
+* html .i-tabsheet-tabs-light {
+       height: 32px;
+}
+*+html .i-tabsheet-tabs-light {
+       height: 32px;
+}
+
+* html .i-tabsheet-light .i-tabsheet-tabitem-selected {
+       border: none;
+       background: #fff url(tabsheet/img/inline-tab-right.png) no-repeat right top;
+       padding: 0;
+       height: 32px;
+}
+*+html .i-tabsheet-light .i-tabsheet-tabitem-selected {
+       border: none;
+       background: #fff url(tabsheet/img/inline-tab-right.png) no-repeat right top;
+       padding: 0;
+       height: 32px;
+}
+
+* html .i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
+       background: transparent url(tabsheet/img/inline-tab-left.png) no-repeat -7px 0;
+       padding: 9px 11px 0 11px;
+}
+*+html .i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
+       background: transparent url(tabsheet/img/inline-tab-left.png) no-repeat -7px 0;
+       padding: 9px 11px 0 11px;
+}
+
+* html .i-tabsheet-deco-light {
+       height: 0;
+}
+*+html .i-tabsheet-deco-light {
+       height: 0;
+}
 .i-textfield {
        background: #fff url(textfield/img/bg.png) repeat-x;
        padding: 2px;
@@ -2244,7 +2414,7 @@ input.i-modified,
 }
 
 .i-window-outerheader {
-       height: 22px;
+       height: 23px;
        margin-left: 9px;
        padding: 15px 34px 11px 12px;
        background: transparent url(window/img/top-right.png) no-repeat right top;
@@ -2274,7 +2444,7 @@ input.i-modified,
 .i-window-contents {
        background: #fff;
        border: 2px solid #acb2b3;
-       border-top-width: 1px;
+       border-top: none;
        border-bottom: none;
 }
 

diff --git a/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css b/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
index 0a5625421854dbadbe95224b4c06d1aef3c48236..54e5be29333c49724b5ec5864c772a940e94ddd6 100644 (file)
--- a/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
+++ b/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
@@ -234,4 +234,174 @@
        overflow: hidden;
        margin: 0;
        width: 100%;
-}
\ No newline at end of file
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* Inline style */
+
+.i-tabsheet-light .i-tabsheet-tabcontainer {
+       height: 32px;
+}
+
+.i-tabsheet-tabs-light {
+       height: 32px;
+       width: 100%;
+       overflow:hidden;
+       background: transparent url(img/inline-tab-bg.png) repeat-x;
+}
+
+.i-tabsheet-light .i-tabsheet-spacertd div {
+       height: 31px;
+       border: none;
+       border-bottom: 1px solid #b6bbbc;
+       background: transparent;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem {
+       border: none;
+       border-bottom: 1px solid #b6bbbc;
+       height: 30px;
+       padding: 0;
+       margin-top: 0;
+       color: #656d73;
+       font-size: 12px;
+       line-height: normal;
+       background: transparent;
+       cursor: pointer;
+       text-shadow: #fff 0 1px 0;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitemcell-first .i-caption {
+       margin-left: 6px;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem .i-caption {
+       height: 24px;
+       padding: 8px 9px 0 9px;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem-selected {
+       border: none;
+       background: #fff url(img/inline-tab-right.png) no-repeat right top;
+       margin: 0;
+       padding: 0;
+       height: 32px;
+       cursor: default;
+       color: #ee5311;
+       text-shadow: none;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem:hover {
+       color: #4b5257;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem-selected:hover {
+       color: #ee5311;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
+       background: transparent url(img/inline-tab-left.png) no-repeat -7px 0;
+       margin: 0;
+       height: 23px;
+       padding: 9px 11px 0 11px;
+       overflow: visible;
+}
+
+.i-tabsheet-light .i-tabsheet-tabitemcell-first .i-tabsheet-tabitem-selected .i-caption {
+       background: transparent url(img/inline-tab-left.png) no-repeat -3px 0;
+       padding-left: 15px;
+}
+
+.i-tabsheet-light .i-tabsheet-content {
+       border: none;
+       background: transparent;
+}
+
+.i-tabsheet-light .i-tabsheet-hidetabs .i-tabsheet-content {
+       border: none;
+}
+
+.i-tabsheet-deco-light {
+       height: 0;
+       overflow: hidden;
+}
+
+.i-tabsheet-deco-light:before {
+       display: none;
+}
+
+
+/* Scroller */
+
+.i-tabsheet-light .i-tabsheet-scrollerPrev,
+.i-tabsheet-light .i-tabsheet-scrollerNext {
+       margin-top: 2px;
+       height: 34px;
+}
+.i-tabsheet-light .i-tabsheet-scrollerPrev-disabled,
+.i-tabsheet-light .i-tabsheet-scrollerNext-disabled {
+       margin-top: 2px;
+       height: 34px;
+}
+
+
+
+
+/* Progress indication */
+
+.i-tabsheet-loading .i-tabsheet-tabs-light .i-tabsheet-tabitem-selected .i-captiontext {
+       margin-left: -3px;
+       padding-left: 3px;
+}
+
+
+
+/* IE specific styles */
+
+* html .i-tabsheet-tabs-light {
+       height: 32px;
+}
+*+html .i-tabsheet-tabs-light {
+       height: 32px;
+}
+
+* html .i-tabsheet-light .i-tabsheet-tabitem-selected {
+       border: none;
+       background: #fff url(img/inline-tab-right.png) no-repeat right top;
+       padding: 0;
+       height: 32px;
+}
+*+html .i-tabsheet-light .i-tabsheet-tabitem-selected {
+       border: none;
+       background: #fff url(img/inline-tab-right.png) no-repeat right top;
+       padding: 0;
+       height: 32px;
+}
+
+* html .i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
+       background: transparent url(img/inline-tab-left.png) no-repeat -7px 0;
+       padding: 9px 11px 0 11px;
+}
+*+html .i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
+       background: transparent url(img/inline-tab-left.png) no-repeat -7px 0;
+       padding: 9px 11px 0 11px;
+}
+
+* html .i-tabsheet-deco-light {
+       height: 0;
+}
+*+html .i-tabsheet-deco-light {
+       height: 0;
+}

diff --git a/WebContent/ITMILL/themes/default/window/img/top-left.png b/WebContent/ITMILL/themes/default/window/img/top-left.png
index fb0744b5ea611f0e342db679053431c495e82809..0a57866ed6b704a691f0dcad23fe95ccf955ef8f 100644 (file)
Binary files a/WebContent/ITMILL/themes/default/window/img/top-left.png and b/WebContent/ITMILL/themes/default/window/img/top-left.png differ

diff --git a/WebContent/ITMILL/themes/default/window/img/top-right.png b/WebContent/ITMILL/themes/default/window/img/top-right.png
index 345c9016cb456c8338158dd164d5227df5b34492..e4e808039823d02922a5710c0a23c29fbab91171 100644 (file)
Binary files a/WebContent/ITMILL/themes/default/window/img/top-right.png and b/WebContent/ITMILL/themes/default/window/img/top-right.png differ

diff --git a/WebContent/ITMILL/themes/default/window/window.css b/WebContent/ITMILL/themes/default/window/window.css
index 611c46d11216659e8af5e94de9c0f39f3607a15f..6327d75942a0a45c660fd6824734b9d39fac0a72 100644 (file)
--- a/WebContent/ITMILL/themes/default/window/window.css
+++ b/WebContent/ITMILL/themes/default/window/window.css
@@ -11,7 +11,7 @@
 }
 
 .i-window-outerheader {
-       height: 22px;
+       height: 23px;
        margin-left: 9px;
        padding: 15px 34px 11px 12px;
        background: transparent url(img/top-right.png) no-repeat right top;
@@ -41,7 +41,7 @@
 .i-window-contents {
        background: #fff;
        border: 2px solid #acb2b3;
-       border-top-width: 1px;
+       border-top: none;
        border-bottom: none;
 }
 

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 ccb7bb6a75adc0808814ec4db1d2fbe41bfd9189..7972fa6034ddd10eecd0ecb7df7f1cf26b0ff793 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -158,8 +158,7 @@ public class ITabsheet extends ITabsheetBase {
         if (client != null && activeTabIndex != tabIndex) {
             tb.selectTab(tabIndex);
             addStyleDependentName("loading");
-            // run updating variables in deferred command to bypass some
-            // FF
+            // run updating variables in deferred command to bypass some FF
             // optimization issues
             DeferredCommand.addCommand(new Command() {
                 public void execute() {