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. --- WebContent/VAADIN/themes/base/slider/slider.css | 65 ---------------------- WebContent/VAADIN/themes/base/slider/slider.scss | 69 ++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 65 deletions(-) delete mode 100644 WebContent/VAADIN/themes/base/slider/slider.css create mode 100644 WebContent/VAADIN/themes/base/slider/slider.scss (limited to 'WebContent/VAADIN/themes/base/slider') diff --git a/WebContent/VAADIN/themes/base/slider/slider.css b/WebContent/VAADIN/themes/base/slider/slider.css deleted file mode 100644 index 1be474f04e..0000000000 --- a/WebContent/VAADIN/themes/base/slider/slider.css +++ /dev/null @@ -1,65 +0,0 @@ -.v-slider { - margin: 5px 0; -} -.v-slider-base { - /* changing the borders will require adjustments to ISlider.java */ - height: 2px; - border-top: 1px solid #ddd; - background: #eee; - border-left: 1px solid #ddd; - border-right: 1px solid #eee; - -} -.v-slider-handle { - background: #aaa; - width: 12px; - height: 12px; - margin-top: -5px; - font-size: 0; -} - -.v-slider-vertical { - width: 2px; - height: auto; - margin: 0 5px; - border: none; - border-left: 1px solid #cccfd0; - border-right: 1px solid #cccfd0; -} -.v-slider-vertical .v-slider-base { - width: 2px; - border-bottom: 1px solid #eee; - border-right: none; -} -.v-slider-vertical .v-slider-handle { - width: 12px; - height: 12px; - font-size: 0; - margin-left: -5px; -} - -.v-slider-feedback { - padding: 2px 5px; - background: #444; - color: #fff; - font-size: 11px; - line-height: 13px; - font-weight: bold; - font-family: Arial, Helvetica, sans-serif; - border-radius: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - margin: -2px 0 0 2px; - text-shadow: 0 1px 0 #000; -} - -/* Disabled by default -.v-slider-error .v-slider-base { - background: #FFE0E0; -} -*/ -/* Disabled by default -.v-slider-required .v-slider-base { - background: #FFE0E0; -} -*/ diff --git a/WebContent/VAADIN/themes/base/slider/slider.scss b/WebContent/VAADIN/themes/base/slider/slider.scss new file mode 100644 index 0000000000..0c65bf1e73 --- /dev/null +++ b/WebContent/VAADIN/themes/base/slider/slider.scss @@ -0,0 +1,69 @@ +@mixin base-slider { + +.v-slider { + margin: 5px 0; +} +.v-slider-base { + /* changing the borders will require adjustments to ISlider.java */ + height: 2px; + border-top: 1px solid #ddd; + background: #eee; + border-left: 1px solid #ddd; + border-right: 1px solid #eee; + +} +.v-slider-handle { + background: #aaa; + width: 12px; + height: 12px; + margin-top: -5px; + font-size: 0; +} + +.v-slider-vertical { + width: 2px; + height: auto; + margin: 0 5px; + border: none; + border-left: 1px solid #cccfd0; + border-right: 1px solid #cccfd0; +} +.v-slider-vertical .v-slider-base { + width: 2px; + border-bottom: 1px solid #eee; + border-right: none; +} +.v-slider-vertical .v-slider-handle { + width: 12px; + height: 12px; + font-size: 0; + margin-left: -5px; +} + +.v-slider-feedback { + padding: 2px 5px; + background: #444; + color: #fff; + font-size: 11px; + line-height: 13px; + font-weight: bold; + font-family: Arial, Helvetica, sans-serif; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + margin: -2px 0 0 2px; + text-shadow: 0 1px 0 #000; +} + +/* Disabled by default +.v-slider-error .v-slider-base { + background: #FFE0E0; +} +*/ +/* Disabled by default +.v-slider-required .v-slider-base { + background: #FFE0E0; +} +*/ + +} \ No newline at end of file -- cgit v1.2.3