diff options
author | Artur Signell <artur@vaadin.com> | 2012-11-23 08:24:11 +0000 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2012-11-23 08:24:11 +0000 |
commit | 1647984d05c5c576c1fe343111c826f3b6c71bc3 (patch) | |
tree | 6c17567f186de0f2b72997244c8e62f7174bfc73 /WebContent/VAADIN/themes/reindeer/textfield/textfield.scss | |
parent | 1f62c02e010434ec29f47c2459f57c890c9bba49 (diff) | |
parent | d6caa6043adef61387ccfece57336593641875c4 (diff) | |
download | vaadin-framework-1647984d05c5c576c1fe343111c826f3b6c71bc3.tar.gz vaadin-framework-1647984d05c5c576c1fe343111c826f3b6c71bc3.zip |
Merge "Fixes #6714 #10330 - wraps theme in themename{}, creates legacy-styles.css, updates themes to support this."
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/textfield/textfield.scss')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/textfield/textfield.scss | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.scss b/WebContent/VAADIN/themes/reindeer/textfield/textfield.scss index 7cd8166aa6..6c3d4000fa 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.scss +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.scss @@ -31,20 +31,20 @@ height: auto; } /* Need more specific selector because of #2384 fixes in base/common/common.css */ -.v-app input.#{$name}, +&.v-app input.#{$name}, .v-window input.#{$name}, -.v-app textarea.v-textarea, +&.v-app textarea.v-textarea, .v-window textarea.v-textarea { padding: 3px 3px 4px; } -.v-app input.#{$name}.v-widget, +&.v-app input.#{$name}.v-widget, .v-window input.#{$name}.v-widget { height: 24px; } -.v-app .#{$name}-focus, +&.v-app .#{$name}-focus, .v-window .#{$name}-focus, .v-popupview-popup .#{$name}-focus, -.v-app .v-textarea-focus, +&.v-app .v-textarea-focus, .v-window .v-textarea-focus, .v-popupview-popup .v-textarea-focus { border-color: #5b97d0; @@ -59,16 +59,16 @@ textarea.v-textarea-prompt { color: #999; } /* Small style textfield */ -.v-app input.#{$name}-small { +&.v-app input.#{$name}-small { font-size: 11px; line-height: normal; height: auto; padding: 2px; } -.v-app textarea.v-textarea-small { +&.v-app textarea.v-textarea-small { font-size: 11px; } -.v-app .v-table input.#{$name}.v-widget, +&.v-app .v-table input.#{$name}.v-widget, .v-window .v-table input.#{$name}.v-widget { padding: 1px 2px; height: auto; @@ -92,11 +92,11 @@ textarea.v-textarea-prompt { .black .v-textarea { background-image: none; } -.v-app .black .#{$name}-focus, +&.v-app .black .#{$name}-focus, .v-window-black .#{$name}-focus, .v-window .black .#{$name}-focus, .v-popupview-popup .black .#{$name}-focus, -.v-app .black .v-textarea-focus, +&.v-app .black .v-textarea-focus, .v-window-black .v-textarea-focus, .v-window .black .v-textarea-focus, .v-popupview-popup .black .v-textarea-focus { |