Fixes #4547: Vaadin theme in Liferay 6.0 theme has extra space and different color...

 * Most critical issues fixed, among which:
   ** Default background color differed from Liferay's bg
   ** Checkboxes and radio buttons having too little space between the input and caption
   ** Nativebutton's have a default look inside Liferay. Fixed Sampler buttons, but Runo will not work inside Liferay.
   ** Sampler breadcrumbs are centered vertically again

svn changeset:12841/svn branch:6.3

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index f8440e387f5736177c979f653a2ed0a711d62f6c..f49fd5ad71596b6fd19084925d1609b58256d8f8 100644 (file)
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_3_0_dev-20100413";}
-.v-theme-version-6_3_0_dev-20100413 {display: none;}
+.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
+.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {

diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
index 515f64155d0abd10fe56a8dc2ac864359c511407..90a73be23fc9cc8ca0f0b171688dcb0d130c7b72 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
index 662dc4c66139d5351c46f51ac35c865b547a4a9a..8ccaa56edd0aeac98ac2c966ac25c6490b6ad1a4 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css
index 342990894e94cfcb18ef7ebb4444ac4eb9e573ff..34c4f4c58575ae44cef6ea51fda93493243610f3 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/common/common.css
+++ b/WebContent/VAADIN/themes/reindeer/common/common.css
@@ -107,4 +107,18 @@
 .v-contextmenu .gwt-MenuItem-selected div {
        background: transparent;
        cursor: default;
+}
+
+/* Fixes for Liferay 6.0 */
+.portlet .v-app {
+       background: transparent;
+}
+.v-app .v-radiobutton input,
+.v-window .v-radiobutton input,
+.v-popupview-popup .v-radiobutton input,
+.v-app .v-checkbox input,
+.v-window .v-checkbox input,
+.v-popupview-popup .v-checkbox input {
+       margin-right: 3px;
+       background: transparent;
 }
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
index 0a7bd350e5324e4500f945831543ad64d34ed6a4..84c52dbf4c09df07f12d2d951c9e4706c441941b 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
index d11847a71dc45a33014c4e5e73958636f6157862..bbededab94218e456671c51bfc77d392b6027abf 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index d043415c12b6c77ae5c3af7910929e152b420b43..25f35db5243c87d09fe41f059b1eac2f50ae73a8 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_3_0_dev-20100413";}
-.v-theme-version-6_3_0_dev-20100413 {display: none;}
+.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
+.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -2711,6 +2711,20 @@ div.v-window-header {
        cursor: default;
 }
 
+/* Fixes for Liferay 6.0 */
+.portlet .v-app {
+       background: transparent;
+}
+.v-app .v-radiobutton input,
+.v-window .v-radiobutton input,
+.v-popupview-popup .v-radiobutton input,
+.v-app .v-checkbox input,
+.v-window .v-checkbox input,
+.v-popupview-popup .v-checkbox input {
+       margin-right: 3px;
+       background: transparent;
+}
+
 .v-datefield-calendarpanel {
        border-collapse: collapse;
        margin: 0;
@@ -5018,6 +5032,7 @@ td.v-datefield-calendarpanel-nextyear {
        border-top-color: #4f83b4;
        border-bottom-color: #5ca0df;
        outline: none;
+       background-color: #fff;
 }
 input.v-textfield-prompt,
 textarea.v-textarea-prompt {
@@ -5078,6 +5093,7 @@ textarea.v-textarea-prompt {
        border-color: #4b7192;
        border-top-color: #3b5a75;
        border-bottom-color: #507596;
+       background-color: #151717;
 }
 .black input.v-textfield-prompt {
        color: #5f6366;

diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
index 1603fecd75b73e0ac4b2735bc1d0198a98a656a6..4c8ed4251ec3e1be5a05531f3644187226a0affa 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
@@ -45,6 +45,7 @@
        border-top-color: #4f83b4;
        border-bottom-color: #5ca0df;
        outline: none;
+       background-color: #fff;
 }
 input.v-textfield-prompt,
 textarea.v-textarea-prompt {
@@ -103,6 +104,7 @@ textarea.v-textarea-prompt {
        border-color: #4b7192;
        border-top-color: #3b5a75;
        border-bottom-color: #507596;
+       background-color: #151717;
 }
 .black input.v-textfield-prompt {
        color: #5f6366;

diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css
index fb1f952d0f9368b0075d17b57f2deeecb373c19b..a43d2bd122f92925ff8560a43422eb9fd812d47f 100644 (file)
--- a/WebContent/VAADIN/themes/sampler/sampler/styles.css
+++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css
@@ -42,7 +42,7 @@
 .v-customcomponent-breadcrumbs {
        font-family: arial, helvetica, verdana, sans-serif;
 }
-.v-sa .v-customcomponent-breadcrumbs {
+.v-mac .v-customcomponent-breadcrumbs {
        font-family: helvetica, arial, verdana, sans-serif;
 }
 .v-customcomponent-breadcrumbs .v-horizontallayout-spacing-on {
@@ -288,7 +288,7 @@
        line-height: 15px;
        padding: 0 0 13px;
 }
-.v-sa .v-app-SamplerApplication .v-tree-menu {
+.v-mac .v-app-SamplerApplication .v-tree-menu {
        font-family: helvetica, arial, verdana, sans-serif;
 }
 .v-app-SamplerApplication .v-tree-menu .v-tree-node span {
@@ -327,7 +327,7 @@
        clear: left;
 }
 
-.v-sa .v-app-SamplerApplication .v-label-root-section {
+.v-mac .v-app-SamplerApplication .v-label-root-section {
        font-family: helvetica, arial, verdana, sans-serif;
 }
 
@@ -488,7 +488,7 @@
        overflow: hidden;
 }
 
-.v-sa .v-csslayout-highlight {
+.v-mac .v-csslayout-highlight {
        font-family: Helvetica, Arial, sans-serif;
 }
 
@@ -639,8 +639,8 @@
 .feature-controls .v-nativebutton-reset {
        font-family: arial, helvetica, verdana, sans-serif;
 }
-.v-sa .feature-controls .v-link-showcode a,
-.v-sa .feature-controls .v-nativebutton-reset {
+.v-mac .feature-controls .v-link-showcode a,
+.v-mac .feature-controls .v-nativebutton-reset {
        font-family: helvetica, arial, verdana, sans-serif;
 }
 .feature-controls .v-nativebutton-reset:focus {
@@ -664,7 +664,7 @@
        font-size: 12px;
        line-height: 19px;
 }
-.v-sa .v-app-SamplerApplication .feature-info {
+.v-mac .v-app-SamplerApplication .feature-info {
        font-family: helvetica, arial, verdana, sans-serif;
 }
 .v-app-SamplerApplication .feature-info div.v-link a {

diff --git a/WebContent/VAADIN/themes/sampler/styles.css b/WebContent/VAADIN/themes/sampler/styles.css
index fbb7f167e9f67c35eb6dcd513d71a411cd4fc80c..5e692355dae99a0bae9a7b9386c86f0b92a15817 100644 (file)
--- a/WebContent/VAADIN/themes/sampler/styles.css
+++ b/WebContent/VAADIN/themes/sampler/styles.css
@@ -3,7 +3,8 @@
 @import url(dummy/styles.css);
 
 /*
- * Not in use currently, breaks ShortcutBasics example.
+ * Not in use currently, breaks all Reindeer "primary/default" button styles.
+ * Fix by replacing the "v-button-primary" to some other style name.
  *
  *@import url(prominentprimaryaction/styles.css);
  */
@@ -23,3 +24,34 @@
 @import url(table/styles.css);
 
 @import url(misc/item-styles.css);
+
+/* Fixes for Liferay 6.0 */
+.portlet .v-app-SamplerApplication {
+       background-color: #fff;
+}
+
+.portlet .v-app .topbar .v-nativebutton {
+       -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+       border-radius: 0;
+}
+
+.portlet .v-app .topbar .v-nativebutton .v-icon {
+       vertical-align: baseline;
+}
+
+.portlet .v-app .v-customcomponent-breadcrumbs {
+       margin: 0;
+}
+
+.portlet .v-app .v-nativebutton-reset,
+.portlet .v-app .v-nativebutton-reset:focus,
+.portlet .v-app .v-nativebutton-reset:hover,
+.portlet .v-app .v-nativebutton-reset:active {
+       border: none;
+       background: transparent;
+       -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+       border-radius: 0;
+       text-shadow: none;
+}
\ No newline at end of file