Merged remaining 6.3.1 fixes

svn changeset:12947/svn branch:6.4

2 files changed, 44 insertions, 8 deletions

diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css
index fb1f952d0f..a43d2bd122 100644
--- 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 fbb7f167e9..1ee032e25a 100644
--- 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,38 @@
 @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;
+}
+
+.portlet .v-app .showcode a {
+	vertical-align: baseline;
+}
\ No newline at end of file