From c0a4b92fc91e47962488f9ea7db2c3499582b6b9 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Mon, 16 Feb 2009 12:32:05 +0000 Subject: [PATCH] Sampler theme update. svn changeset:6852/svn branch:trunk --- .../themes/sampler/sampler/desc-arrow.png | Bin 0 -> 352 bytes .../sampler/sampler/info-bubble-top.png | Bin 2933 -> 2913 bytes .../sampler/sampler/sample-desc-arrow.png | Bin 301 -> 363 bytes .../themes/sampler/sampler/sample-desc-bg.png | Bin 305 -> 313 bytes .../ITMILL/themes/sampler/sampler/styles.css | 107 +++++++++++++----- .../toolkit/demo/sampler/FeatureView.java | 12 +- 6 files changed, 87 insertions(+), 32 deletions(-) create mode 100644 WebContent/ITMILL/themes/sampler/sampler/desc-arrow.png diff --git a/WebContent/ITMILL/themes/sampler/sampler/desc-arrow.png b/WebContent/ITMILL/themes/sampler/sampler/desc-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..a272a11150f701b998b628444b7d920c38542a75 GIT binary patch literal 352 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 EKdzz_Hvj+t diff --git a/WebContent/ITMILL/themes/sampler/sampler/sample-desc-arrow.png b/WebContent/ITMILL/themes/sampler/sampler/sample-desc-arrow.png index ae79de39aae6df63b35f9d179b4883d5ebf9ff12..e08ebc25d3a1402d730e13d9339aee81b034cbd7 100644 GIT binary patch delta 334 zcmV-U0kQtA0_y@HiBL{Q4GJ0x0000DNk~Le000070000B2m=5B0EA9wnvo$Wf2B}N zR7E#!rmCu{Hf^SIhn+oht37h6H*BTY-QqG`iRkF)He-%6UW!F`tUhd;GF*q?;NbcB z`P$mr&(F`q#KbOFfSsqY@bK`Ern)w1q3-VPIB}^saH;9(>7JgRNPMqCZk>#lpp2ol zw6wG|Vv#*_szPp_FkXvwe~HP-f60THt>WV1LT{e;_xFN~mN;;zHfo~L(b41M<2Y}q zH*cu%@$olqr~3N(Li@W^00017Nkl561_m=RBta#0H71~b gEe%-_9)JJ?0MK#@I|e?Gn*aa+07*qoM6N<$f(Yo9nE(I) delta 271 zcmaFOw3bP+Gr-TCmrII^fq{Y7)59eQNOJ=*8wWFxRC+Vz)I>#%`q%)U5LeUI&{b-oktvdPwUwGo3tJ`X*sT#h0-!5NM%XNswRge{_(F zEWq$aLM9HV)W*}rF{I*F(gapUMT3(JN);{@i8-2_VuofM(GgB_{6i)QADNc)Bz?lP sv`Hz`Qy)A?dp3!Yi80Kvfq|Lf(L2`dUHTtMs5x`1GiIPXcdk2j zt~G0p*nM`F=C!KZl^tZurz6-J9Vu)cdj&OqC9wU zuQFtxfuaP30000{Nkl`9vZUft`WV)eCX8VxHoDsGM)kq0D?~j8`suq#{d8T M07*qoM6N<$f=}LT?f?J) delta 254 zcmVE&Mb1iDr>tgbiXfmz%F&aFnhu-b-*%##V~urGJeD>ZM-UL zx-ovlEpxssaJ@2r#V&ThFnYo)alJBt#W8)vEpomyfyOO#zcYfyG=#@1ZoDdNyAz^m zeq8_n08dFoK~#9!EWrmBLr?%k!5cL?A<;r~``=-nf6NfEo0lh>xoF8xdwtXBq_+B0 z6bu^R;;2W)S6}3$tlH|VF{5@GV(DRic<6agsQ&^C0DQ6q%oWnZLjV8(07*qoM6N<$ Ef>x()hX4Qo diff --git a/WebContent/ITMILL/themes/sampler/sampler/styles.css b/WebContent/ITMILL/themes/sampler/sampler/styles.css index 083b1b2b38..0b39eeb601 100644 --- a/WebContent/ITMILL/themes/sampler/sampler/styles.css +++ b/WebContent/ITMILL/themes/sampler/sampler/styles.css @@ -32,6 +32,9 @@ } .i-customcomponent-breadcrumbs { + font-family: arial, helvetica, verdana, sans-serif; +} +.i-sa .i-customcomponent-breadcrumbs { font-family: helvetica, arial, verdana, sans-serif; } .i-customcomponent-breadcrumbs .i-horizontallayout-spacing-on { @@ -41,34 +44,31 @@ .i-customcomponent-breadcrumbs .i-link a, .i-customcomponent-breadcrumbs .i-label { text-decoration: none; - color: #1b252b; + color: #000; text-shadow: 0 1px 0 #8f9193; font-size: 11px; - line-height: 13px; + line-height: normal; padding-top: 3px; display: block; float: left; } .i-customcomponent-breadcrumbs .i-label { - font-size: 13px; - line-height: 12px; - padding: 4px 0 0 0; } .i-sa .i-customcomponent-breadcrumbs .i-label { - padding-top: 3px; + } .i-ie .i-customcomponent-breadcrumbs .i-label { - margin-top: -1px; + } .i-ff .i-customcomponent-breadcrumbs .i-label { - margin-top: -2px; + } .i-customcomponent-breadcrumbs .i-link span { text-decoration: none; } .i-customcomponent-breadcrumbs .i-link a:hover { - text-decoration: none; color: #000; + text-decoration: underline; } .i-customcomponent-breadcrumbs .i-link-bold { height: 20px; @@ -104,6 +104,7 @@ } .i-customcomponent-breadcrumbs .i-link-bold a:hover { color: #c2c4c6; + text-decoration: none; } .i-app-SamplerApplication .i-horizontallayout-topbar .i-button-link span { @@ -178,15 +179,23 @@ } .i-app-SamplerApplication .i-tree-menu { - font-family: helvetica, arial, verdana, sans-serif; + font-family: arial, helvetica, verdana, sans-serif; font-size: 12px; line-height: 17px; padding: 13px 0; } +.i-sa .i-app-SamplerApplication .i-tree-menu { + font-family: helvetica, arial, verdana, sans-serif; +} .i-app-SamplerApplication .i-tree-menu .i-tree-node-selected span { background: #7d8490; padding: 1px; } +.i-ie6 .i-tree-menu .i-tree-node-ie6compatnode { + height: 0; + overflow: hidden; +} + .i-app-SamplerApplication .i-label-section { font-family: "Helvetica Neue", helvetica, arial, verdana, sans-serif; @@ -265,10 +274,13 @@ .i-app-SamplerApplication .feature-info { background: #1e2123 url(info-bubble-bg.png) repeat-y; color: #b8bbbe; - font-family: helvetica, arial, verdana, sans-serif; + font-family: arial, helvetica, verdana, sans-serif; font-size: 12px; line-height: 19px; } +.i-sa .i-app-SamplerApplication .feature-info { + font-family: helvetica, arial, verdana, sans-serif; +} .i-app-SamplerApplication .feature-info div.i-link a { color: #b7c0c7; font-size: 11px; @@ -335,42 +347,83 @@ margin: 0 5px 0 9px; } -.i-app-SamplerApplication .feature-info .i-label-sample-description { +.i-app-SamplerApplication .feature-info .description { + padding: 0; +} +.i-app-SamplerApplication .feature-info .description div.outer-deco { margin: 0 5px 0 9px; - color: #e0ecff; - text-shadow: 0 1px 0 #19406b; - border: 1px solid #225792; - border-top: none; - border-bottom: 1px solid #2763ad; - padding: 5px 0 0 0; width: 353px; } +.i-app-SamplerApplication .feature-info .description div.deco { + padding: 0 19px 13px 19px; + position: relative; +} +.i-app-SamplerApplication .feature-info .description span.deco { + display: block; + position: absolute; + height: 12px; + width: 7px; + background: transparent url(desc-arrow.png) no-repeat; + left: -5px; + top: 40%; +} +.i-ie6 .i-app-SamplerApplication .feature-info .description span.deco { + left: -24px; +} -.i-app-SamplerApplication .feature-info .i-label-sample-description div.deco { - padding: 1px 19px 13px 19px; - background: #2a6bba url(sample-desc-bg.png) repeat-x; - border: 1px solid #478cca; +.i-app-SamplerApplication .feature-info .sample-description { + padding: 0; +} +.i-app-SamplerApplication .feature-info .sample-description div.outer-deco { + margin: 0 5px 0 9px; + color: #e0ecff; + text-shadow: 0 1px 0 #283b4e; + border: 1px solid #336391; + border-top-color: #161719; + border-bottom-color: #2e5b92; + width: 353px; +} +.i-ie6 .i-app-SamplerApplication .feature-info .sample-description div.outer-deco { border-top: none; +} + +.i-app-SamplerApplication .feature-info .sample-description div.deco { + padding: 13px 19px 13px 19px; + background: #31629e url(sample-desc-bg.png) repeat-x; + border: 1px solid #4b81b2; + border-top-color: #558bbb; border-bottom: none; + position: relative; } -.i-app-SamplerApplication .feature-info .i-label-sample-description span.deco { +.i-app-SamplerApplication .feature-info .sample-description span.deco { display: block; - height: 6px; - background: transparent url(sample-desc-arrow.png) no-repeat 50% 0; - margin: -6px 0 13px 0; + position: absolute; + height: 11px; + width: 7px; + background: transparent url(sample-desc-arrow.png) no-repeat; + left: -7px; + top: 45%; } +.i-ie6 .i-app-SamplerApplication .feature-info .sample-description span.deco { + left: -26px; +} + .i-app-SamplerApplication .i-link-showcode { margin-left: 3px; } .i-app-SamplerApplication .i-button-showcode, .i-app-SamplerApplication .i-link-showcode { - font-family: helvetica, arial, verdana, sans-serif; + font-family: arial, helvetica, verdana, sans-serif; display: inline; font-size: 12px; line-height: 20px; height: 20px; } +.i-sa .i-app-SamplerApplication .i-button-showcode, +.i-sa .i-app-SamplerApplication .i-link-showcode { + font-family: helvetica, arial, verdana, sans-serif; +} .i-app-SamplerApplication .i-button-showcode span, .i-app-SamplerApplication .i-link-showcode span { color: #8b8e91; diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureView.java b/src/com/itmill/toolkit/demo/sampler/FeatureView.java index 8458d23991..797b336720 100644 --- a/src/com/itmill/toolkit/demo/sampler/FeatureView.java +++ b/src/com/itmill/toolkit/demo/sampler/FeatureView.java @@ -119,10 +119,10 @@ public class FeatureView extends HorizontalLayout { String desc = parent.getDescription(); boolean hasParentDesc = false; + final Label parentLabel = new Label(parent.getDescription()); if (desc != null && desc != "") { - Label l = new Label(parent.getDescription()); - l.setContentMode(Label.CONTENT_XHTML); - right.addComponent(l); + parentLabel.setContentMode(Label.CONTENT_XHTML); + right.addComponent(parentLabel); hasParentDesc = true; } @@ -131,11 +131,13 @@ public class FeatureView extends HorizontalLayout { // Sample description uses additional decorations if a parent // description is found final Label l = new Label( - "
" - + desc + "
", Label.CONTENT_XHTML); + "
" + + desc + "
", Label.CONTENT_XHTML); right.addComponent(l); if (hasParentDesc) { l.setStyleName("sample-description"); + } else { + l.setStyleName("description"); } } -- 2.39.5