diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-02-12 15:49:31 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-02-12 15:49:49 +0200 |
| commit | 42f2387165471d08bbd24d4c3ae4a271d2cda4c5 (patch) | |
| tree | 4418a7610edf326d308f65ee0d79d4d09c341a93 /WebContent/VAADIN/themes | |
| parent | 50381a619458017d69b044435a22fae457a5d4c1 (diff) | |
| parent | 40e07d0172532ebf5750b8c2aab5ec892e42cdab (diff) | |
| download | vaadin-framework-42f2387165471d08bbd24d4c3ae4a271d2cda4c5.tar.gz vaadin-framework-42f2387165471d08bbd24d4c3ae4a271d2cda4c5.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: I8f1f412eeb450688bba58b715eba6db9e4ae43ae
Diffstat (limited to 'WebContent/VAADIN/themes')
4 files changed, 22 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index 54e0916da1..0e19c8a339 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -55,6 +55,11 @@ margin: 0; overflow: hidden; } + +.v-modal-window-open { + overflow: hidden; +} + $font-size: 16px; $line-height: normal; @mixin base { diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index 07e244a76f..5cae1b26ce 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -227,6 +227,10 @@ input::-ms-clear { font-size: 0; line-height: normal; } +/* Set font-size in order to make Firefox scrolling better #11353 */ +.v-ff & .v-scrollable { + font-size: $font-size; +} .v-ios.v-webkit & .v-scrollable { -webkit-overflow-scrolling: touch; } diff --git a/WebContent/VAADIN/themes/base/debug/debug.scss b/WebContent/VAADIN/themes/base/debug/debug.scss index 0992f19bb9..b50245a7be 100644 --- a/WebContent/VAADIN/themes/base/debug/debug.scss +++ b/WebContent/VAADIN/themes/base/debug/debug.scss @@ -251,6 +251,14 @@ width: 100%; } + .v-debugwindow-selector > span.value { + width: 100%; + } + + .v-debugwindow-selector :hover { + background: rgba(255,32,32,0.5); + } + /* LOG */ .v-debugwindow-log { font-family: monospace; diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss index 7c5c72c1df..4554672da4 100644 --- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss +++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss @@ -20,7 +20,10 @@ textarea.v-textarea, input.#{$primaryStyleName}[type="text"], textarea.v-textarea, .v-filterselect { - padding: .2em; + padding-bottom: .1em; + padding-top: .1em; + padding-left: .2em; + padding-right: .2em; } input.#{$primaryStyleName}[type="text"] { @@ -29,7 +32,7 @@ input.#{$primaryStyleName}[type="text"] { input.v-widget.#{$primaryStyleName}[type="text"], .v-filterselect { - height: 1.6em; + height: 1.7em; } &.v-app input.#{$primaryStyleName}, |