From cfa455d6cfd4a535fd77cbc76637a57e7024e9ac Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Wed, 8 Aug 2012 14:27:31 +0300 Subject: Standard themes in SCSS form, updated CompileDefaultTheme (#9223) Conversion performed for most themes trivial, just rename file and wrap in a mixin. For chameleon compounds, also nesting used. In some cases, related small files combined in a single SCSS file Chameleon accordion and select contain fixes other than just a missing semicolon. --- .../VAADIN/themes/base/csslayout/csslayout.css | 28 ------------------- .../VAADIN/themes/base/csslayout/csslayout.scss | 32 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 WebContent/VAADIN/themes/base/csslayout/csslayout.css create mode 100644 WebContent/VAADIN/themes/base/csslayout/csslayout.scss (limited to 'WebContent/VAADIN/themes/base/csslayout') diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.css b/WebContent/VAADIN/themes/base/csslayout/csslayout.css deleted file mode 100644 index 064edd28a4..0000000000 --- a/WebContent/VAADIN/themes/base/csslayout/csslayout.css +++ /dev/null @@ -1,28 +0,0 @@ -.v-csslayout { - overflow: hidden; -} -.v-csslayout-margin, .v-csslayout-container { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.v-has-width > .v-csslayout-margin, -.v-has-width > .v-csslayout-margin > .v-csslayout-container { - width: 100%; -} -.v-has-height > .v-csslayout-margin, -.v-has-height > .v-csslayout-margin > .v-csslayout-container { - height: 100%; -} -.v-csslayout-margin-top { - padding-top: 12px; -} -.v-csslayout-margin-bottom { - padding-bottom: 12px; -} -.v-csslayout-margin-left { - padding-left: 12px; -} -.v-csslayout-margin-right { - padding-right: 12px; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.scss b/WebContent/VAADIN/themes/base/csslayout/csslayout.scss new file mode 100644 index 0000000000..7bd26d4197 --- /dev/null +++ b/WebContent/VAADIN/themes/base/csslayout/csslayout.scss @@ -0,0 +1,32 @@ +@mixin base-csslayout { + +.v-csslayout { + overflow: hidden; +} +.v-csslayout-margin, .v-csslayout-container { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.v-has-width > .v-csslayout-margin, +.v-has-width > .v-csslayout-margin > .v-csslayout-container { + width: 100%; +} +.v-has-height > .v-csslayout-margin, +.v-has-height > .v-csslayout-margin > .v-csslayout-container { + height: 100%; +} +.v-csslayout-margin-top { + padding-top: 12px; +} +.v-csslayout-margin-bottom { + padding-bottom: 12px; +} +.v-csslayout-margin-left { + padding-left: 12px; +} +.v-csslayout-margin-right { + padding-right: 12px; +} + +} \ No newline at end of file -- cgit v1.2.3