diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-17 11:30:57 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-17 11:30:57 +0300 |
| commit | 250e7beab06b185aebe3e97e2d5f7102d1e1b270 (patch) | |
| tree | a3de6edfdaf711721cb10b09025dee3f60a807b9 /WebContent/VAADIN | |
| parent | ff56225f04d1ca67923fb2b05d37adc4907678da (diff) | |
| parent | 800efdee9d891fb07343b18bca7cd543ffebb615 (diff) | |
| download | vaadin-framework-250e7beab06b185aebe3e97e2d5f7102d1e1b270.tar.gz vaadin-framework-250e7beab06b185aebe3e97e2d5f7102d1e1b270.zip | |
Merge branch 'master' into html5-doctype
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/base/layout/layout.scss | 19 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/layouts/layouts.scss | 19 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/select/select.scss | 1 |
3 files changed, 21 insertions, 18 deletions
diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss index 439510c863..04df35872e 100644 --- a/WebContent/VAADIN/themes/base/layout/layout.scss +++ b/WebContent/VAADIN/themes/base/layout/layout.scss @@ -28,6 +28,25 @@ TODO padding-left: 12px; } +/* Different for historical reasons: previously was inherited directly from Base theme */ +/* TODO unify these values in version 7 */ +.v-gridlayout.v-layout-margin-top { + padding-top: 24px; +} +.v-gridlayout.v-layout-margin-bottom { + padding-bottom: 24px; +} +.v-gridlayout.v-layout-margin-left { + padding-left: 24px; +} +.v-gridlayout.v-layout-margin-right { + padding-right: 24px; +} +.v-gridlayout .v-layout-spacing-on { + padding-left: 12px; + padding-top: 12px; +} + .v-spacing { width: 6px; height: 6px; diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss index c0204ec041..fb47c100f8 100644 --- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss +++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss @@ -34,24 +34,7 @@ height: 7px; width: 6px; } -/* Different for historical reasons: previously was inherited directly from Base theme */ -/* TODO unify these values in version 7 */ -.v-gridlayout-margin-top { - padding-top: 24px; -} -.v-gridlayout-margin-bottom { - padding-bottom: 24px; -} -.v-gridlayout-margin-left { - padding-left: 24px; -} -.v-gridlayout-margin-right { - padding-right: 24px; -} -.v-gridlayout-spacing-on { - padding-left: 12px; - padding-top: 12px; -} + /* Blue background */ .v-verticallayout-blue, .v-horizontallayout-blue, diff --git a/WebContent/VAADIN/themes/reindeer/select/select.scss b/WebContent/VAADIN/themes/reindeer/select/select.scss index 4a8d07fd91..240f88aebb 100644 --- a/WebContent/VAADIN/themes/reindeer/select/select.scss +++ b/WebContent/VAADIN/themes/reindeer/select/select.scss @@ -40,6 +40,7 @@ overflow: hidden; width: 25px; height: 24px; + background-position: 0 0; background-image: url(img/right.png); /** sprite-ref: verticals ; sprite-margin-bottom: 1px */ cursor: default; margin-right: -25px; |