From 4ba62e8ba7242ed2611861f92822d1217132e997 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Tue, 2 Dec 2008 11:05:28 +0000 Subject: [PATCH] Fixes IWindow height calculation (one extra pixel because of top border on content element). 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 --- WebContent/ITMILL/themes/default/styles.css | 180 +++++++++++++++++- .../themes/default/tabsheet/tabsheet.css | 172 ++++++++++++++++- .../themes/default/window/img/top-left.png | Bin 282 -> 413 bytes .../themes/default/window/img/top-right.png | Bin 808 -> 950 bytes .../ITMILL/themes/default/window/window.css | 4 +- .../terminal/gwt/client/ui/ITabsheet.java | 3 +- 6 files changed, 349 insertions(+), 10 deletions(-) diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css index f9c0ae7f87..dd4334989b 100644 --- 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 0a56254218..54e5be2933 100644 --- 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 GIT binary patch delta 364 zcmV-y0h9ik0-Xbp7YZ>51^@s62)KjLks&940Y6DZK~#9!q?6A|#6S$jzf8yKUKW?) zZ7JeSaY0znOF{7Db-_3A0ek?jf-m8Nh~S_1vO6)EU8UCTCSYhvXn%Z@WD4VY$yr9Y$+vE2!WI^l8Ow6(&~TmBu<7BJ35{Xz@g|t)j|LP(N?sqT%0000< KMNUMnLSTXl$*VX3 delta 232 zcmV=K~#9!V%)X=00RyX2*mb4Y{P;@ z(hP{(f!GNqfUc+-h+9AmVL?F#1vxnePEHOKMRR~S8N|@h(qs_e<74>u?;pdTzklJ1 zLO=?bnVA^Ojg1)?7#SIU|M|m!Ze2czFwoUy`2YVu*aT$21U1D*R9KjSjg5`rA5alf zIshs105RlbWH3xXR%8QWu(7k@3NNrCB@p937Hg0du@a+*AQ)9Ns%TWvsG?Cts1*=1 i6BDquV8p5jAiw}PpC;g;F-7kH00004HwRgw#~UE?0+3^Di#h!CY+q?#;bbt^Nh~-;0-R-tB4ncK%Pb z{dMIrLO|O=;LWe`(3-`|!R&G(J}_kRAS20n<4gF*i7*Dq_#{(g9Wd{4|;mJ*0C zLs^ujs_yjFU*5ja(LHy*{rvf7n_qr@sQQ1;9+3--5H&Y4EuUYxvO4ope|Ptnm!GFU z^w$R}di?7`gc{6{*t?DU?&Vxszj}4ahW+#3-P<|WZL!`=`>NuaPYdigUO<(#Y>HdI zdqLgnV`m>;o?K;oNERaAFu~1t^1gZVmK}XmU0a*MZUt4Ycy;2t>*|vqe%%N6M8x%P z-`b8>Gr^Q3Ufq0QyBdO<`;YAlGb7YohA6m%3S7(zE;eP#u`s9)8*X@cMLMuU>{Zxt z>Fy@McTh*LTo*5aX>NG2t4VJGGekxpTJx_jT+g0c7g%9IdT2FcZH^>Vf5#f>hx2+0 zU}o=0f_tyz=N=1YSP;DM`tJ=lY|C507j8Qc_MC&sG}tTOfm_q`ntK;KU@~s=zJU8| z<5lAetB(PbC>RJtzWY@v2#d^)wckGP;=IdI4wZF!?Y`r7BP@|rAgl`6B@g%ahobUw zHdvT11e%`hv>opB4_Pka2-8*4VFBdu^3zVZ`wB{Hs?Q?1@aZ=#E`^&-#18SgM>X@{an^L HB{Ts5@~|cU literal 808 zcmeAS@N?(olHy`uVBq!ia0y~yV7~xl8*s1zNzdC4OM#SRiEBhjaDG}zd16s2gJVj5 zQmTSyZen_BP-b`tlJHPv9&aasKueUbvL4*&4 zz22o4wz~Ary}L(0Jxsh~H~0K9`Qxr%fB%ehV23D4SREQF`qiLRw%_0XF-Q1p`*8M-<8$pXDxv$=`yY1 z{=2>t<^hL|X8)Og?SpX{Y+)W|aDsWDK?P>31KiCMSYYOHz%@*Q8=?r;Aanuh5e2vg z54h7>;2J#Pb_u{WaKgez0Iop=Zr6}=Tz>lUOdD2M99${AyZ^O46A#0rWg*vto-P&x ONqD;YxvX