Merge "Merge branch 'master' into grid" into grid

5 files changed, 106 insertions, 75 deletions

diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.scss b/WebContent/VAADIN/themes/base/datefield/datefield.scss
index cbba9b46f3..d094235c0f 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.scss
@@ -56,7 +56,8 @@
 	border: 1px solid #ddd;
 }
 .v-disabled .#{$primaryStyleName}-calendarpanel-day,
-.v-disabled .#{$primaryStyleName}-calendarpanel-day-today {
+.v-disabled .#{$primaryStyleName}-calendarpanel-day-today,
+.v-disabled.#{$primaryStyleName}-popupcalendar .#{$primaryStyleName}-button {
 	cursor: default;
 }
 .#{$primaryStyleName}-calendarpanel-day-disabled,
diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
index fb47c100f8..0b0b311daa 100644
--- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
+++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
@@ -42,6 +42,7 @@
 .v-gridlayout-blue,
 .v-csslayout-blue,
 .v-formlayout-blue,
+.v-absolutelayout-blue,
 .v-splitpanel-vertical-blue,
 .v-splitpanel-horizontal-blue {
 	background-color: #bcd3de;
@@ -56,6 +57,7 @@
 .v-gridlayout-white,
 .v-csslayout-white,
 .v-formlayout-white,
+.v-absolutelayout-white,
 .v-splitpanel-vertical-white,
 .v-splitpanel-horizontal-white  {
 	background-color: #fff;
@@ -72,6 +74,7 @@
 .v-gridlayout-black,
 .v-csslayout-black,
 .v-formlayout-black,
+.v-absolutelayout-black,
 .v-splitpanel-vertical-black,
 .v-splitpanel-horizontal-black {
 	background: #1e2022 url(img/black-bg.png) repeat-x;
@@ -80,4 +83,4 @@
 	background: #1e2022 url(img/black-bg.png) repeat-x;
 }
 
-}
\ No newline at end of file
+}
diff --git a/WebContent/VAADIN/themes/tests-responsive/styles.css b/WebContent/VAADIN/themes/tests-responsive/styles.css
new file mode 100644
index 0000000000..4bfc6dd768
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-responsive/styles.css
@@ -0,0 +1,92 @@
+@import url(../reindeer/legacy-styles.css);
+
+.grid {
+    overflow: visible;
+}
+
+/* Style the items in the grid */
+.grid > .v-label {
+    outline: 1px dotted rgba(0, 0, 0, .3);
+    text-align: center;
+    padding: 2em 0;
+    font-size: 16px;
+    font-weight: bold;
+}
+
+/* We want the items in the grid to stay between 100px and 200px, if possible */
+.first[width-range~="-200px"] .v-label {
+    width: 100%;
+}
+
+.first[width-range~="201px-400px"] > .v-label {
+    width: 50%;
+}
+
+.first[width-range~="401px-600px"] > .v-label {
+    width: 33.3333%;
+}
+
+.first[width-range~="601-800"] > .v-label {
+    width: 25%;
+}
+
+.first[width-range~="801-1000px"] > .v-label {
+    width: 20%;
+}
+
+.first[width-range~="1001px-"] > .v-label {
+    width: 16.6667%;
+}
+
+.second[width-range~="0-100px"] .v-label {
+    width: 100%;
+}
+
+.second[width-range~="101px-200px"] > .v-label {
+    width: 50%;
+}
+
+.second[width-range~="201px-300px"] > .v-label {
+    width: 33.3333%;
+}
+
+.second[width-range~="301px-400px"] > .v-label {
+    width: 25%;
+}
+
+.second[width-range~="401px-500px"] > .v-label {
+    width: 20%;
+}
+
+.second[width-range~="501px-"] > .v-label {
+    width: 16.6667%;
+}
+
+.description {
+    padding: 1em;
+    line-height: 1.5;
+}
+
+.description[width-range="-100px"] {
+    font-size: 10px;
+}
+
+.description[width-range="101px-200px"] {
+    font-size: 12px;
+}
+
+.description[width-range="200px-350px"] {
+    font-size: 14px;
+}
+
+.description[width-range="351px-500px"] {
+    font-size: 18px;
+}
+
+.description[width-range="501px-700px"] {
+    font-size: 24px;
+}
+
+.description[width-range="701px-"] {
+    font-size: 30px;
+}
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 6e4b77845b..38d9f5211c 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -298,8 +298,7 @@
             <li>Shared library (<tt>vaadin-shared</tt>) for both
                 server- and client-side libraries
             </li>
-            <li>Built-in themes (<tt>vaadin-themes</tt>) and the
-                theme compiler (<tt>vaadin-theme-compiler</tt>)
+            <li>Built-in themes (<tt>vaadin-themes</tt>)
             </li>
             <li>Dependency libraries provided under the <tt>lib/</tt>
                 folder
@@ -322,8 +321,6 @@
             <tt>vaadin-client-compiled</tt>
             ,
             <tt>vaadin-shared</tt>
-            ,
-            <tt>vaadin-theme-compiler</tt>
             , and
             <tt>vaadin-themes</tt>
             from the main folder and the dependencies from the
@@ -337,6 +334,13 @@
             components.)
         </p>
 
+        <h4 id="package.updates">Updates to the Packaging</h4>
+        <p>
+            Since Vaadin 7.2.0, the old vaadin-theme-compiler has been moved into
+            a separate project and renamed to vaadin-sass-compiler. It is now included
+            along with the other 3rd party dependencies in the ZIP package.
+        </p>
+
         <p>
             For pure client-side development, you only need the
             <tt>vaadin-client</tt>
diff --git a/WebContent/statictestfiles/browserfeatures/WebkitPositionAbsoluteScrollbars.html b/WebContent/statictestfiles/browserfeatures/WebkitPositionAbsoluteScrollbars.html
deleted file mode 100644
index 7547816006..0000000000
--- a/WebContent/statictestfiles/browserfeatures/WebkitPositionAbsoluteScrollbars.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!doctype>
-<html><head>
-  <style>
-  #spacer {
-  	width: 100px;
-  	height: 100px;
-  	background: blue;
-  }
-  #scrollable {
-  	background: white;
-	border: 1px solid black;
-  	overflow: auto;
-  	position: relative;
-  	width: 250px;
-  }
-  #container {
-	position:relative;
-	display:inline-block;
-	width:100%;
-	height:130px;
-  }
-  #margin {
-	position: absolute;
-    width: 200px; 
-    top: 12px; 
-    margin-right: 12px; 
-    left: 12px; 
-    height: 110px;
-  }
-  </style>
-  </head>
- <body>
- <div>
- Starting point: No horizontal scrollbar<br/>
- Expected: Get back to starting point after clicking through steps (do 1, do  2, cancel 1, cancel 2)<br/>
- Actual: Scrollbars after doing the steps<br/><br/>
- </div>
-<button id="step1" onclick="step1();">Step 1 - Enlarge container</button> 
-<button id="step2" onclick="step2();">Step 2 - Move child</button> 
-<button id="step3" onclick="step3();">Step 3 - Reduce container</button>
-<button id="step4" onclick="step4();">Step 4 - Return child</button>
-<div id="scrollable">
-<div id="container">
-<div id="margin" style="">
-<div id="spacer" style="height: 100px; width: 100%;">
-</div>
-</div>
-</div>
-</div>
-  
-<script>
-function step1() {
-	document.getElementById("container").style.width="110%";
-}
-function step2() {
-	document.getElementById("margin").style.left="200px";
-}
-function step3() {
-	document.getElementById("container").style.width="100%";
-}
-function step4() {
-	document.getElementById("margin").style.left="12px";      
-}
-
-</script>
-
-
-</body>
-</html>