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/runo/slider/slider.css | 70 ----------------------- WebContent/VAADIN/themes/runo/slider/slider.scss | 73 ++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 70 deletions(-) delete mode 100644 WebContent/VAADIN/themes/runo/slider/slider.css create mode 100644 WebContent/VAADIN/themes/runo/slider/slider.scss (limited to 'WebContent/VAADIN/themes/runo/slider') diff --git a/WebContent/VAADIN/themes/runo/slider/slider.css b/WebContent/VAADIN/themes/runo/slider/slider.css deleted file mode 100644 index 698d15de90..0000000000 --- a/WebContent/VAADIN/themes/runo/slider/slider.css +++ /dev/null @@ -1,70 +0,0 @@ -.v-slider { - border-top: 1px solid #cccfd0; - border-bottom: 1px solid #cccfd0; - margin: 5px 0; -} -.v-slider-base { - /* changing the borders will require adjustments to ISlider.java */ - height: 2px; - background: #f3f3f4; - border-top: 1px solid #cbcdce; - border-left: 1px solid #cccfd0; - border-right: 1px solid #cccfd0; -} -.v-slider-handle { - background: transparent url(img/handle-horizontal.png); - width: 12px; - height: 12px; - margin-top: -5px; - cursor: pointer; -} -.v-slider-handle:hover { - background-position: left bottom; -} -.v-slider-scrollbar .v-slider-handle, -.v-slider-scrollbar.v-slider-vertical .v-slider-handle { - background: #ffffff; - border: 1px solid #cccfd0; - border-radius: 6px; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; -} - -.v-slider-vertical { - width: 3px; - margin: 0 5px; - border: none; - border-left: 1px solid #cccfd0; - border-right: 1px solid #cccfd0; -} -.v-slider-vertical .v-slider-base { - width: 2px; - border-left: 1px solid #cbcdce; - border-right: none; - background: #f3f3f4; - border-top: 1px solid #cccfd0; - border-bottom: 1px solid #cccfd0; -} -.v-slider-vertical .v-slider-handle { - background: transparent url(img/handle-vertical.png); - width: 12px; - height: 12px; - margin-left: -5px; -} -.v-slider-vertical .v-slider-handle-active { - background-position: left bottom; -} - -/* Disabled by default -.v-slider-error .v-slider-base { - background:transparent; - background-color: #FFE0E0; -} -*/ - -/* Disabled by default -.v-slider-required .v-slider-base { - background:transparent; - background-color: #FFE0E0; -} -*/ diff --git a/WebContent/VAADIN/themes/runo/slider/slider.scss b/WebContent/VAADIN/themes/runo/slider/slider.scss new file mode 100644 index 0000000000..3bc9e28702 --- /dev/null +++ b/WebContent/VAADIN/themes/runo/slider/slider.scss @@ -0,0 +1,73 @@ +@mixin runo-slider { + +.v-slider { + border-top: 1px solid #cccfd0; + border-bottom: 1px solid #cccfd0; + margin: 5px 0; +} +.v-slider-base { + /* changing the borders will require adjustments to ISlider.java */ + height: 2px; + background: #f3f3f4; + border-top: 1px solid #cbcdce; + border-left: 1px solid #cccfd0; + border-right: 1px solid #cccfd0; +} +.v-slider-handle { + background: transparent url(img/handle-horizontal.png); + width: 12px; + height: 12px; + margin-top: -5px; + cursor: pointer; +} +.v-slider-handle:hover { + background-position: left bottom; +} +.v-slider-scrollbar .v-slider-handle, +.v-slider-scrollbar.v-slider-vertical .v-slider-handle { + background: #ffffff; + border: 1px solid #cccfd0; + border-radius: 6px; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; +} + +.v-slider-vertical { + width: 3px; + margin: 0 5px; + border: none; + border-left: 1px solid #cccfd0; + border-right: 1px solid #cccfd0; +} +.v-slider-vertical .v-slider-base { + width: 2px; + border-left: 1px solid #cbcdce; + border-right: none; + background: #f3f3f4; + border-top: 1px solid #cccfd0; + border-bottom: 1px solid #cccfd0; +} +.v-slider-vertical .v-slider-handle { + background: transparent url(img/handle-vertical.png); + width: 12px; + height: 12px; + margin-left: -5px; +} +.v-slider-vertical .v-slider-handle-active { + background-position: left bottom; +} + +/* Disabled by default +.v-slider-error .v-slider-base { + background:transparent; + background-color: #FFE0E0; +} +*/ + +/* Disabled by default +.v-slider-required .v-slider-base { + background:transparent; + background-color: #FFE0E0; +} +*/ +} \ No newline at end of file -- cgit v1.2.3