From: Marc Englund <marc@vaadin.com>
Date: Thu, 4 Oct 2012 06:34:37 +0000 (+0300)
Subject: Merge branch 'master' into sass
X-Git-Tag: 7.0.0.beta6~87^2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0f5606dace38d575efcd2e0109390b34aebb05d3;p=vaadin-framework.git

Merge branch 'master' into sass

Conflicts:
	WebContent/VAADIN/themes/base/formlayout/formlayout.scss
	WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss

Change-Id: Ie895a1bbafdcf2fe79d500efb04c6eef3f5a812e
---

0f5606dace38d575efcd2e0109390b34aebb05d3
diff --cc WebContent/VAADIN/themes/base/formlayout/formlayout.scss
index 48a1bf0fde,258a8e3f15..6bfe112254
--- a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss
+++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.scss
@@@ -17,39 -17,39 +17,39 @@@
  	text-align:right;
  	white-space: nowrap;
  }
 -.v-formlayout-errorcell, .v-formlayout-captioncell {
 +.#{$name}-errorcell, .#{$name}-captioncell {
  	width: 1px; /* Don't use any extra space */
  }
 -.v-formlayout-captioncell .v-caption {
 +.#{$name}-captioncell .v-caption {
  	overflow: visible;
  }
- .#{$name}-spacing .#{$name}-row .#{$name}-captioncell, 
- .#{$name}-spacing .#{$name}-row .#{$name}-contentcell,
- .#{$name}-spacing .#{$name}-row .#{$name}-errorcell {
 -.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-captioncell, 
 -.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-contentcell,
 -.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-errorcell {
++.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-captioncell, 
++.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-contentcell,
++.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-errorcell {
  	padding-top: 6px;
  }
- .#{$name}-spacing .#{$name}-firstrow .#{$name}-captioncell, 
- .#{$name}-spacing .#{$name}-firstrow .#{$name}-contentcell,
- .#{$name}-spacing .#{$name}-firstrow .#{$name}-errorcell {
 -.v-formlayout-spacing > tbody > .v-formlayout-firstrow > .v-formlayout-captioncell, 
 -.v-formlayout-spacing > tbody > .v-formlayout-firstrow > .v-formlayout-contentcell,
 -.v-formlayout-spacing > tbody > .v-formlayout-firstrow > .v-formlayout-errorcell {
++.#{$name}-spacing > tbody > .#{$name}-firstrow > .#{$name}-captioncell, 
++.#{$name}-spacing > tbody > .#{$name}-firstrow > .#{$name}-contentcell,
++.#{$name}-spacing > tbody > .#{$name}-firstrow > .#{$name}-errorcell {
  	padding-top: 0;
  }
- .#{$name}-margin-top .#{$name}-firstrow .#{$name}-captioncell, 
- .#{$name}-margin-top .#{$name}-firstrow .#{$name}-contentcell,
- .#{$name}-margin-top .#{$name}-firstrow .#{$name}-errorcell {
 -.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-captioncell, 
 -.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-contentcell,
 -.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-errorcell {
++.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-captioncell, 
++.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-contentcell,
++.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-errorcell {
  	padding-top: 12px;
  }
- .#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-captioncell,
- .#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-contentcell,
- .#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-errorcell {
 -.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-captioncell,
 -.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-contentcell,
 -.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-errorcell {
++.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-captioncell,
++.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-contentcell,
++.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-errorcell {
  	padding-bottom: 12px;
  }
- .#{$name}-margin-left .#{$name}-captioncell {
 -.v-formlayout-margin-left > tbody > .v-formlayout-row > .v-formlayout-captioncell {
++.#{$name}-margin-left > tbody > .#{$name}-row > .#{$name}-captioncell {
  	padding-left: 12px;
  } 
- .#{$name}-margin-right .#{$name}-contentcell {
 -.v-formlayout-margin-right > tbody > .v-formlayout-row > .v-formlayout-contentcell {
++.#{$name}-margin-right > tbody > .#{$name}-row > .#{$name}-contentcell {
  	padding-right: 12px;
  }
 -.v-formlayout-captioncell .v-caption .v-required-field-indicator {
 +.#{$name}-captioncell .v-caption .v-required-field-indicator {
  	float: none;
  }
  
diff --cc WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
index 010d6e7db2,e73340fd3b..cecc439b09
--- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
+++ b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
@@@ -12,25 -12,25 +12,25 @@@
  	text-align: right;
  	white-space: nowrap;
  }
- .#{$name}-spacing .#{$name}-row .#{$name}-captioncell, 
- .#{$name}-spacing .#{$name}-row .#{$name}-contentcell,
- .#{$name}-spacing .#{$name}-row .#{$name}-errorcell {
 -.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-captioncell, 
 -.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-contentcell,
 -.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-errorcell {
++.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-captioncell, 
++.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-contentcell,
++.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-errorcell {
  	padding-top: 8px;
  }
- .#{$name}-margin-top .#{$name}-firstrow .#{$name}-captioncell, 
- .#{$name}-margin-top .#{$name}-firstrow .#{$name}-contentcell,
- .#{$name}-margin-top .#{$name}-firstrow .#{$name}-errorcell {
 -.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-captioncell, 
 -.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-contentcell,
 -.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-errorcell {
++.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-captioncell, 
++.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-contentcell,
++.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-errorcell {
  	padding-top: 15px;
  }
- .#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-captioncell,
- .#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-contentcell,
- .#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-errorcell {
 -.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-captioncell,
 -.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-contentcell,
 -.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-errorcell {
++.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-captioncell,
++.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-contentcell,
++.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-errorcell {
  	padding-bottom: 15px;
  }
- .#{$name}-margin-left .#{$name}-captioncell {
 -.v-formlayout-margin-left > tbody > .v-formlayout-row > .v-formlayout-captioncell {
++.#{$name}-margin-left > tbody > .#{$name}-row > .#{$name}-captioncell {
  	padding-left: 18px;
  } 
- .#{$name}-margin-right .#{$name}-contentcell {
 -.v-formlayout-margin-right > tbody > .v-formlayout-row > .v-formlayout-contentcell {
++.#{$name}-margin-right > tbody > .#{$name}-row > .#{$name}-contentcell {
  	padding-right: 18px;
  }
  /* form */