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/textfield/richtext.css | 58 ---------- .../themes/base/textfield/textfield-normal.css | 47 -------- .../VAADIN/themes/base/textfield/textfield.css | 2 - .../VAADIN/themes/base/textfield/textfield.scss | 118 +++++++++++++++++++++ 4 files changed, 118 insertions(+), 107 deletions(-) delete mode 100644 WebContent/VAADIN/themes/base/textfield/richtext.css delete mode 100644 WebContent/VAADIN/themes/base/textfield/textfield-normal.css delete mode 100644 WebContent/VAADIN/themes/base/textfield/textfield.css create mode 100644 WebContent/VAADIN/themes/base/textfield/textfield.scss (limited to 'WebContent/VAADIN/themes/base/textfield') diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/richtext.css deleted file mode 100644 index 6a236886cc..0000000000 --- a/WebContent/VAADIN/themes/base/textfield/richtext.css +++ /dev/null @@ -1,58 +0,0 @@ -.v-richtextarea { - border: 1px solid #aaa; - overflow: hidden; -} -.v-richtextarea .gwt-RichTextArea { - background: #fff; - border: none; -} -.v-richtextarea .gwt-HTML { - height: 100%; -} -.v-richtextarea .gwt-RichTextToolbar { - white-space: nowrap; - background: #959595 url(img/richtext-toolbar-bg.png) repeat-x 0 -42px; - border-bottom: 1px solid #7d7d7d; - padding: 2px; - overflow: hidden; -} -.v-richtextarea .gwt-RichTextToolbar-top { - padding-bottom: 1px; - overflow: hidden; - white-space: normal; -} -.v-richtextarea .gwt-RichTextToolbar-bottom { - clear: left; - overflow: hidden; - white-space: nowrap; -} -.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton, -.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton { - float: left; - display: inline; - width: 22px; - height: 21px; - overflow: hidden; - background: transparent url(img/richtext-toolbar-bg.png) repeat-x; - cursor: pointer; - margin-right: 2px; - text-align: center; -} -.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton-down, -.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton-down, -.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton-down-hovering, -.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton-down-hovering { - background-position: 0 -21px; -} -.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton img, -.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton img { - -} -.v-richtextarea .gwt-RichTextToolbar .gwt-ListBox { - width: 24.5%; - margin-right: 2px; -} - -.v-richtextarea-readonly { - border: none; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/textfield/textfield-normal.css b/WebContent/VAADIN/themes/base/textfield/textfield-normal.css deleted file mode 100644 index 557a960c76..0000000000 --- a/WebContent/VAADIN/themes/base/textfield/textfield-normal.css +++ /dev/null @@ -1,47 +0,0 @@ -.v-textfield { - text-align: left /* Force default alignment */ -} -.v-textarea { - resize: none; -} -.v-textfield-focus, -.v-textarea-focus { -} -input.v-textfield-prompt, -textarea.v-textarea-prompt { - color: #999; - font-style: italic; -} -input.v-textfield-readonly, -textarea.v-textarea-readonly { - background: transparent; - border: none; - resize: none; -} -input.v-disabled, -textarea.v-disabled { - resize: none; -} -input.v-textfield-readonly:focus, -textarea.v-textarea-readonly:focus { - outline: none; -} -/* Disabled by default -.v-textarea-error, -.v-textfield-error, -.v-richtextarea-error iframe.gwt-RichTextArea { - background: #FFE0E0; -} -*/ -/* Disabled by default -.v-textarea-required, -.v-textfield-required, -.v-richtextarea-required iframe.gwt-RichTextArea { - background: #FFE0E0; -} -*/ -/* Safari focus glow fix */ -.v-sa input:focus, -.v-sa textarea:focus { - outline-width: medium; -} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/textfield/textfield.css b/WebContent/VAADIN/themes/base/textfield/textfield.css deleted file mode 100644 index 956b302efe..0000000000 --- a/WebContent/VAADIN/themes/base/textfield/textfield.css +++ /dev/null @@ -1,2 +0,0 @@ -@import "textfield-normal.css"; -@import "richtext.css"; \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/textfield/textfield.scss b/WebContent/VAADIN/themes/base/textfield/textfield.scss new file mode 100644 index 0000000000..b8e54e6887 --- /dev/null +++ b/WebContent/VAADIN/themes/base/textfield/textfield.scss @@ -0,0 +1,118 @@ +// textfield-normal.css + +@mixin base-textfield { + +.v-textfield { + text-align: left; /* Force default alignment */ +} +.v-textarea { + resize: none; +} +.v-textfield-focus, +.v-textarea-focus { +} +input.v-textfield-prompt, +textarea.v-textarea-prompt { + color: #999; + font-style: italic; +} +input.v-textfield-readonly, +textarea.v-textarea-readonly { + background: transparent; + border: none; + resize: none; +} +input.v-disabled, +textarea.v-disabled { + resize: none; +} +input.v-textfield-readonly:focus, +textarea.v-textarea-readonly:focus { + outline: none; +} +/* Disabled by default +.v-textarea-error, +.v-textfield-error, +.v-richtextarea-error iframe.gwt-RichTextArea { + background: #FFE0E0; +} +*/ +/* Disabled by default +.v-textarea-required, +.v-textfield-required, +.v-richtextarea-required iframe.gwt-RichTextArea { + background: #FFE0E0; +} +*/ +/* Safari focus glow fix */ +.v-sa input:focus, +.v-sa textarea:focus { + outline-width: medium; +} + +} + +// richtext.css + +@mixin base-richtextarea { + +.v-richtextarea { + border: 1px solid #aaa; + overflow: hidden; +} +.v-richtextarea .gwt-RichTextArea { + background: #fff; + border: none; +} +.v-richtextarea .gwt-HTML { + height: 100%; +} +.v-richtextarea .gwt-RichTextToolbar { + white-space: nowrap; + background: #959595 url(img/richtext-toolbar-bg.png) repeat-x 0 -42px; + border-bottom: 1px solid #7d7d7d; + padding: 2px; + overflow: hidden; +} +.v-richtextarea .gwt-RichTextToolbar-top { + padding-bottom: 1px; + overflow: hidden; + white-space: normal; +} +.v-richtextarea .gwt-RichTextToolbar-bottom { + clear: left; + overflow: hidden; + white-space: nowrap; +} +.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton, +.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton { + float: left; + display: inline; + width: 22px; + height: 21px; + overflow: hidden; + background: transparent url(img/richtext-toolbar-bg.png) repeat-x; + cursor: pointer; + margin-right: 2px; + text-align: center; +} +.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton-down, +.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton-down, +.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton-down-hovering, +.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton-down-hovering { + background-position: 0 -21px; +} +.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton img, +.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton img { + +} +.v-richtextarea .gwt-RichTextToolbar .gwt-ListBox { + width: 24.5%; + margin-right: 2px; +} + +.v-richtextarea-readonly { + border: none; +} + +} \ No newline at end of file -- cgit v1.2.3