Fixes #5664 & #5669

svn changeset:15210/svn branch:6.4

diff --git a/WebContent/VAADIN/themes/liferay/panel/panel.css b/WebContent/VAADIN/themes/liferay/panel/panel.css
index 35e3c1063a3404353672e5c7d414bab3dcd8cde9..bb0bbe53380c05cbdf3e04ded055870e6c73ae04 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/panel/panel.css
+++ b/WebContent/VAADIN/themes/liferay/panel/panel.css
@@ -1,22 +1,16 @@
-.v-panel-caption {
-       text-shadow: 1px 1px #fff;
-       font-size: 12px;
-       color: #222;
-       background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
-       border: 1px solid #999;
-       -webkit-border-radius: 4px 4px 0 0;
-       -moz-border-radius: 4px 4px 0 0;
-       border-radius: 4px 4px 0 0;
-       padding: 4px 5px 5px 5px;
+.v-panel {
+       background: transparent url(top-left.png) no-repeat;
 }
 
+.v-panel-caption,
 .v-panel-nocaption {
-       height: 4px;
-       border: 1px solid #999;
-       border-bottom: none;
-       -webkit-border-radius: 4px 4px 0 0;
-       -moz-border-radius: 4px 4px 0 0;
-       border-radius: 4px 4px 0 0;
+       text-shadow: 1px 1px #fff;
+       font-size: 12px;
+       color: #222;
+       margin-left: 4px;
+       background: transparent url(top-right.png) no-repeat right top;
+       padding: 5px 5px 10px 2px;
+       height: 12px;
 }
 
 .v-panel-caption .v-icon { 
@@ -25,7 +19,6 @@
 
 .v-panel-content {
        border: 1px solid #999;
-       border-top: none;
        -webkit-border-radius: 0 0 4px 4px;
        -moz-border-radius: 0 0 4px 4px;
        border-radius: 0 0 4px 4px;
@@ -33,8 +26,13 @@
 
 /* Light style Panel */
 
+.v-panel-light {
+       background: transparent;
+}
+
 .v-panel-caption-light,
 .v-panel-nocaption-light {
+       margin: 0;
        border: none;
        background: none;
 }
@@ -43,12 +41,42 @@
        border-bottom: 1px solid #999;
 }
 
+.v-panel-nocaption-light {
+       padding: 0;
+       height: 0;
+}
+
 .v-panel-content-light {
        border: none;
 }
 .v-panel-content-light > div {
        background: transparent;
 }
-.v-ie6 .v-panel-content-light {
+
+.v-panel-deco {
+       height: 0;
+       overflow: hidden;
+}
+
+/* IE specific rules */
+.v-ie .v-panel {
        background: transparent;
-}
\ No newline at end of file
+}
+.v-ie .v-panel-caption,
+.v-ie .v-panel-nocaption {
+       border: 1px solid #999;
+       border-bottom: none;
+       background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
+       margin: 0;
+       padding-left: 5px;
+}
+
+.v-ie .v-panel-caption-light,
+.v-ie .v-panel-nocaption-light {
+       border: none;
+       background: transparent;
+}
+
+.v-ie .v-panel-caption-light {
+       border-bottom: 1px solid #999;
+}

diff --git a/WebContent/VAADIN/themes/liferay/panel/top-left.png b/WebContent/VAADIN/themes/liferay/panel/top-left.png
new file mode 100644 (file)
index 0000000..12e0780
Binary files /dev/null and b/WebContent/VAADIN/themes/liferay/panel/top-left.png differ

diff --git a/WebContent/VAADIN/themes/liferay/panel/top-right.png b/WebContent/VAADIN/themes/liferay/panel/top-right.png
new file mode 100644 (file)
index 0000000..08203ae
Binary files /dev/null and b/WebContent/VAADIN/themes/liferay/panel/top-right.png differ

diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index 3567877029f12d498658eec14a89864b6d5207fd..eed3379a6a0ef3a1de352c68d0ebc9faa6b1afa1 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_4_5_dev-20100921";}
-.v-theme-version-6_4_5_dev-20100921 {display: none;}
+.v-theme-version:after {content:"6_4_5_dev-20100926";}
+.v-theme-version-6_4_5_dev-20100926 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -2399,6 +2399,7 @@ div.v-app {
 .v-ie8 .v-datefield-popup,
 .v-ie8 .v-filterselect-suggestpopup, 
 .v-ie8 .v-shadow,
+.v-ie8 .v-shadow-window,
 .v-ie8 .v-window,
 .v-ie8 .v-popupview-popup,
 .v-ie8 .v-tooltip,
@@ -2408,6 +2409,10 @@ div.v-app {
        margin-top: -16px;
 }
 
+.v-ie6 .v-view {
+       border-top: none;
+}
+
 .v-contextmenu {
        background: #ccc9c9 url(/html/themes/classic/images/application/menu_bg.png) repeat-x 0 0;
        border: 1px solid;
@@ -2741,25 +2746,19 @@ span.v-datefield-calendarpanel-month {
        margin: 0;
 }
 
-.v-panel-caption {
-       text-shadow: 1px 1px #fff;
-       font-size: 12px;
-       color: #222;
-       background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
-       border: 1px solid #999;
-       -webkit-border-radius: 4px 4px 0 0;
-       -moz-border-radius: 4px 4px 0 0;
-       border-radius: 4px 4px 0 0;
-       padding: 4px 5px 5px 5px;
+.v-panel {
+       background: transparent url(panel/top-left.png) no-repeat;
 }
 
+.v-panel-caption,
 .v-panel-nocaption {
-       height: 4px;
-       border: 1px solid #999;
-       border-bottom: none;
-       -webkit-border-radius: 4px 4px 0 0;
-       -moz-border-radius: 4px 4px 0 0;
-       border-radius: 4px 4px 0 0;
+       text-shadow: 1px 1px #fff;
+       font-size: 12px;
+       color: #222;
+       margin-left: 4px;
+       background: transparent url(panel/top-right.png) no-repeat right top;
+       padding: 5px 5px 10px 2px;
+       height: 12px;
 }
 
 .v-panel-caption .v-icon { 
@@ -2768,7 +2767,6 @@ span.v-datefield-calendarpanel-month {
 
 .v-panel-content {
        border: 1px solid #999;
-       border-top: none;
        -webkit-border-radius: 0 0 4px 4px;
        -moz-border-radius: 0 0 4px 4px;
        border-radius: 0 0 4px 4px;
@@ -2776,8 +2774,13 @@ span.v-datefield-calendarpanel-month {
 
 /* Light style Panel */
 
+.v-panel-light {
+       background: transparent;
+}
+
 .v-panel-caption-light,
 .v-panel-nocaption-light {
+       margin: 0;
        border: none;
        background: none;
 }
@@ -2786,15 +2789,45 @@ span.v-datefield-calendarpanel-month {
        border-bottom: 1px solid #999;
 }
 
+.v-panel-nocaption-light {
+       padding: 0;
+       height: 0;
+}
+
 .v-panel-content-light {
        border: none;
 }
 .v-panel-content-light > div {
        background: transparent;
 }
-.v-ie6 .v-panel-content-light {
+
+.v-panel-deco {
+       height: 0;
+       overflow: hidden;
+}
+
+/* IE specific rules */
+.v-ie .v-panel {
        background: transparent;
 }
+.v-ie .v-panel-caption,
+.v-ie .v-panel-nocaption {
+       border: 1px solid #999;
+       border-bottom: none;
+       background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
+       margin: 0;
+       padding-left: 5px;
+}
+
+.v-ie .v-panel-caption-light,
+.v-ie .v-panel-nocaption-light {
+       border: none;
+       background: transparent;
+}
+
+.v-ie .v-panel-caption-light {
+       border-bottom: 1px solid #999;
+}
 
 .v-popupview-popup {
        background: #d4d4d4 url(/html/themes/classic/images/application/state_default_bg.png) repeat-x 0 0;
@@ -3244,15 +3277,15 @@ select {
 }
 
 .v-tabsheet-caption-close {
-       background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat -80px -128px;
+       background: transparent url(tabsheet/close.png) no-repeat right top;
+       -background-image: url(tabsheet/close-ie6.png);
        cursor: default;
        float: right;
-       margin: -1px -1px 0;
+       margin: 3px -1px 0;
        overflow: hidden;
-       padding-left: 2px;
        text-indent: -999px;
-       width: 10px;
-       height: 16px;
+       width: 13px;
+       height: 9px;
 }
 
 .v-app input[type="text"],
@@ -3273,6 +3306,7 @@ textarea.v-textarea-prompt {
 
 .v-tree-node {
        background: transparent url(tree/arrows_sprites.png) no-repeat -42px 1px;
+       -background: transparent url(tree/arrows_sprites-ie6.png) no-repeat -42px 1px;
 }
 
 .v-tree-node span {
@@ -3331,7 +3365,7 @@ textarea.v-textarea-prompt {
 }
 
 .v-window {
-       background: none;
+       background: transparent;
 }
 
 .v-window-wrap {
@@ -3339,26 +3373,33 @@ textarea.v-textarea-prompt {
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
        border-radius: 4px;
-       background: #fff;
+       background: #fff url(window/top-left.png) no-repeat;
+}
+
+.v-ie6 .v-window-wrap,
+.v-ie7 .v-window-wrap {
+       background-position: 1px 1px;
+}
+
+.v-ie6 .v-window-wrap {
+       border-bottom: none;
+}
+
+.v-ie6 .v-window-footer {
+       border-bottom: 1px solid #c8c9ca;
+       margin-top: -1px;
+       padding-top: 1px;
 }
 
 .v-window-outerheader {
-       background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
-       border-color: #c8c9ca #aeb2b8 #aeb2b8 #c8c9ca;
-       border-style: solid;
-       border-width: 0 0 1px;
-       padding-left: 10px;
        height: 16px;
-       padding: 6px 32px 6px 10px;
+       margin-left: 9px;
+       padding: 10px 40px 12px 2px;
+       background: transparent url(window/top-right.png) no-repeat right top;
+       
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
        border-radius: 4px;
-       margin: 5px;
-}
-
-.v-ie6 .v-window-outerheader,
-.v-ie7 .v-window-outerheader {
-       margin-bottom: 0;
 }
 
 .v-window-header {
@@ -3371,6 +3412,15 @@ textarea.v-textarea-prompt {
        padding: 0 5px 0 5px;
 }
 
+.v-window-footer {
+       height: 5px;
+       overflow: visible;
+}
+
+.v-window div.v-window-footer-noresize {
+       height: 5px;
+}
+
 .v-window-closebox {
        background: url(window/closebutton_sprites.png) no-repeat scroll 0 0 transparent;
        position: absolute;
@@ -3380,11 +3430,6 @@ textarea.v-textarea-prompt {
        top: 8px;
 }
 
-.v-ie6 .v-window-closebox,
-.v-ie7 .v-window-closebox {
-       top: 4px;
-}
-
 .v-window-closebox:hover {
        background-position: 0 -24px;   
 }
@@ -3394,15 +3439,8 @@ textarea.v-textarea-prompt {
 }
 
 .v-window-resizebox {
-       background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -64px -228px;
-       width: 14px;
-       height: 16px;   
-}
-
-.v-shadow-window {
-       padding-bottom: 11px;
-}
-
-.v-ie .v-shadow-window {
-       padding-bottom: 0;
+       background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -69px -229px;
+       width: 10px;
+       height: 10px;
+       bottom: 0;      
 }

diff --git a/WebContent/VAADIN/themes/liferay/window/top-left.png b/WebContent/VAADIN/themes/liferay/window/top-left.png
new file mode 100644 (file)
index 0000000..3beb6bd
Binary files /dev/null and b/WebContent/VAADIN/themes/liferay/window/top-left.png differ

diff --git a/WebContent/VAADIN/themes/liferay/window/top-right.png b/WebContent/VAADIN/themes/liferay/window/top-right.png
new file mode 100644 (file)
index 0000000..dd8d61f
Binary files /dev/null and b/WebContent/VAADIN/themes/liferay/window/top-right.png differ

diff --git a/WebContent/VAADIN/themes/liferay/window/window.css b/WebContent/VAADIN/themes/liferay/window/window.css
index e4c7aa391a18fef2ef2df264463ce5710dd05e80..6b61d880f126b209993fcb1f08a47df932c669ab 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/window/window.css
+++ b/WebContent/VAADIN/themes/liferay/window/window.css
@@ -1,5 +1,5 @@
 .v-window {
-       background: none;
+       background: transparent;
 }
 
 .v-window-wrap {
@@ -7,26 +7,33 @@
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
        border-radius: 4px;
-       background: #fff;
+       background: #fff url(top-left.png) no-repeat;
+}
+
+.v-ie6 .v-window-wrap,
+.v-ie7 .v-window-wrap {
+       background-position: 1px 1px;
+}
+
+.v-ie6 .v-window-wrap {
+       border-bottom: none;
+}
+
+.v-ie6 .v-window-footer {
+       border-bottom: 1px solid #c8c9ca;
+       margin-top: -1px;
+       padding-top: 1px;
 }
 
 .v-window-outerheader {
-       background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
-       border-color: #c8c9ca #aeb2b8 #aeb2b8 #c8c9ca;
-       border-style: solid;
-       border-width: 0 0 1px;
-       padding-left: 10px;
        height: 16px;
-       padding: 6px 32px 6px 10px;
+       margin-left: 9px;
+       padding: 10px 40px 12px 2px;
+       background: transparent url(top-right.png) no-repeat right top;
+       
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
        border-radius: 4px;
-       margin: 5px;
-}
-
-.v-ie6 .v-window-outerheader,
-.v-ie7 .v-window-outerheader {
-       margin-bottom: 0;
 }
 
 .v-window-header {
@@ -39,6 +46,15 @@
        padding: 0 5px 0 5px;
 }
 
+.v-window-footer {
+       height: 5px;
+       overflow: visible;
+}
+
+.v-window div.v-window-footer-noresize {
+       height: 5px;
+}
+
 .v-window-closebox {
        background: url(closebutton_sprites.png) no-repeat scroll 0 0 transparent;
        position: absolute;
@@ -48,11 +64,6 @@
        top: 8px;
 }
 
-.v-ie6 .v-window-closebox,
-.v-ie7 .v-window-closebox {
-       top: 4px;
-}
-
 .v-window-closebox:hover {
        background-position: 0 -24px;   
 }
@@ -62,16 +73,8 @@
 }
 
 .v-window-resizebox {
-       background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -64px -228px;
-       width: 14px;
-       height: 16px;   
-}
-
-.v-shadow-window {
-       padding-bottom: 11px;
-}
-
-.v-ie6 .v-shadow-window,
-.v-ie7 .v-shadow-window {
-       padding-bottom: 0;
+       background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -69px -229px;
+       width: 10px;
+       height: 10px;
+       bottom: 0;      
 }
\ No newline at end of file