diff options
Diffstat (limited to 'WebContent')
-rw-r--r-- | WebContent/VAADIN/themes/tests-valo-dark/_variables.scss | 3 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/valo/components/_csslayout.scss | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/tests-valo-dark/_variables.scss b/WebContent/VAADIN/themes/tests-valo-dark/_variables.scss index 21bcd00ae9..ea40e1eb89 100644 --- a/WebContent/VAADIN/themes/tests-valo-dark/_variables.scss +++ b/WebContent/VAADIN/themes/tests-valo-dark/_variables.scss @@ -9,10 +9,11 @@ $v-font-family: Roboto, sans-serif; $v-font-weight: 400; $v-font-weight--header: 400; $v-bevel: inset 0 1px 2px v-tint, inset 0 0 1px (v-tint 0.1); -$v-shadow: 0 0 0 3px darken($v-background-color, 3%), 0 1px 1px 3px lighten($v-background-color, 5%); +$v-shadow: 0 0 0 3px rgba(0,0,0,0.32), 0 1px 0 3px rgba(255,255,255,0.14); $v-textfield-bevel: inset 0 2px 2px v-shade; $v-textfield-shadow: $v-shadow; $v-unit-size: 40px; $v-overlay-shadow: 0 0 0 3px (v-shade 8), 0 5px 10px (v-shade 4); +$v-component-group-spacing: 6px; @import "../valo/valo"; diff --git a/WebContent/VAADIN/themes/valo/components/_csslayout.scss b/WebContent/VAADIN/themes/valo/components/_csslayout.scss index ee7cd933c5..95bdcc5a3a 100644 --- a/WebContent/VAADIN/themes/valo/components/_csslayout.scss +++ b/WebContent/VAADIN/themes/valo/components/_csslayout.scss @@ -1,3 +1,6 @@ +$v-component-group-spacing: null !default; + + @mixin valo-csslayout ($primary-stylename: v-csslayout, $include-additional-styles: contains($v-included-additional-styles, csslayout)){ @if $include-additional-styles { .#{$primary-stylename}-well { @@ -54,9 +57,9 @@ $v-border-width: first-number($v-border); @if $v-border-width > 0 { - margin-left: -$v-border-width; + margin-left: $v-component-group-spacing or -$v-border-width; } @else { - margin-left: 1px; + margin-left: $v-component-group-spacing or 1px; } &:first-child { |