diff options
Diffstat (limited to 'WebContent/VAADIN')
4 files changed, 37 insertions, 37 deletions
diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss b/WebContent/VAADIN/themes/base/formlayout/formlayout.scss index 48a1bf0fde..6bfe112254 100644 --- a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss +++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.scss @@ -23,30 +23,30 @@ .#{$name}-captioncell .v-caption { overflow: visible; } -.#{$name}-spacing .#{$name}-row .#{$name}-captioncell, -.#{$name}-spacing .#{$name}-row .#{$name}-contentcell, -.#{$name}-spacing .#{$name}-row .#{$name}-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 { +.#{$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 { +.#{$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 { +.#{$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 { +.#{$name}-margin-left > tbody > .#{$name}-row > .#{$name}-captioncell { padding-left: 12px; } -.#{$name}-margin-right .#{$name}-contentcell { +.#{$name}-margin-right > tbody > .#{$name}-row > .#{$name}-contentcell { padding-right: 12px; } .#{$name}-captioncell .v-caption .v-required-field-indicator { diff --git a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss index 010d6e7db2..cecc439b09 100644 --- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss +++ b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss @@ -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 { +.#{$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 { +.#{$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 { +.#{$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 { +.#{$name}-margin-left > tbody > .#{$name}-row > .#{$name}-captioncell { padding-left: 18px; } -.#{$name}-margin-right .#{$name}-contentcell { +.#{$name}-margin-right > tbody > .#{$name}-row > .#{$name}-contentcell { padding-right: 18px; } /* form */ diff --git a/WebContent/VAADIN/themes/runo/formlayout/formlayout.scss b/WebContent/VAADIN/themes/runo/formlayout/formlayout.scss index 0766269d8b..bb27da1d5b 100644 --- a/WebContent/VAADIN/themes/runo/formlayout/formlayout.scss +++ b/WebContent/VAADIN/themes/runo/formlayout/formlayout.scss @@ -9,25 +9,25 @@ text-align:right; white-space: nowrap; } -.v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, -.v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, -.v-formlayout-spacing .v-formlayout-row .v-formlayout-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 { padding-top: 8px; } -.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, -.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, -.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-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 { padding-top: 15px; } -.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, -.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, -.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-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 { padding-bottom: 15px; } -.v-formlayout-margin-left .v-formlayout-captioncell { +.v-formlayout-margin-left > tbody > .v-formlayout-row > .v-formlayout-captioncell { padding-left: 18px; } -.v-formlayout-margin-right .v-formlayout-contentcell { +.v-formlayout-margin-right > tbody > .v-formlayout-row > .v-formlayout-contentcell { padding-right: 18px; } /* form */ diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js index ed798ea146..c6a7b7ed5d 100644 --- a/WebContent/VAADIN/vaadinBootstrap.js +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -100,7 +100,7 @@ url += '/'; } } - url += ((/\?/).test(url) ? "&" : "?") + "browserDetails"; + url += ((/\?/).test(url) ? "&" : "?") + "browserDetails=1"; var rootId = getConfig("rootId"); if (rootId !== undefined) { url += "&rootId=" + rootId; |