diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-04-17 14:18:05 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-04-17 14:18:05 +0300 |
| commit | a5f128853ac604983270175b0a5c971f5d951a5d (patch) | |
| tree | 23d8dd79adfead7f527541c66c1603027d287955 /WebContent/VAADIN | |
| parent | c23beb2c030cc21bc50be4541123160912553729 (diff) | |
| parent | 4d2b5c2ab1ddf5194458270807d4cc476618ef76 (diff) | |
| download | vaadin-framework-a5f128853ac604983270175b0a5c971f5d951a5d.tar.gz vaadin-framework-a5f128853ac604983270175b0a5c971f5d951a5d.zip | |
Merge remote branch 'origin/master' into layoutgraph
Conflicts:
WebContent/VAADIN/themes/base/paintable/paintable.css
Diffstat (limited to 'WebContent/VAADIN')
6 files changed, 12 insertions, 13 deletions
diff --git a/WebContent/VAADIN/themes/base/label/label.css b/WebContent/VAADIN/themes/base/label/label.css new file mode 100644 index 0000000000..366dbdf26f --- /dev/null +++ b/WebContent/VAADIN/themes/base/label/label.css @@ -0,0 +1,3 @@ +.v-label { + overflow: hidden; +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/paintable/paintable.css b/WebContent/VAADIN/themes/base/paintable/paintable.css index c42da19e4f..fbe7275113 100644 --- a/WebContent/VAADIN/themes/base/paintable/paintable.css +++ b/WebContent/VAADIN/themes/base/paintable/paintable.css @@ -1,6 +1,6 @@ -.v-paintable { +.v-connector { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; text-align: left; -}
\ No newline at end of file +} diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css index a7601bb649..74882fa693 100644 --- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css +++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css @@ -25,7 +25,7 @@ input.v-textfield[type="text"] { height: 1.2em; } -input.v-paintable.v-textfield[type="text"], +input.v-connector.v-textfield[type="text"], .v-filterselect { height: 1.6em; } diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index dce5dffba0..09c47dc8d4 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -35,8 +35,8 @@ .v-window textarea.v-textarea { padding: 3px 3px 4px; } -.v-app input.v-textfield.v-paintable, -.v-window input.v-textfield.v-paintable { +.v-app input.v-textfield.v-connector, +.v-window input.v-textfield.v-connector { height: 24px; } .v-app .v-textfield-focus, @@ -66,8 +66,8 @@ textarea.v-textarea-prompt { .v-app textarea.v-textarea-small { font-size: 11px; } -.v-app .v-table input.v-textfield.v-paintable, -.v-window .v-table input.v-textfield.v-paintable { +.v-app .v-table input.v-textfield.v-connector, +.v-window .v-table input.v-textfield.v-connector { padding: 1px 2px; height: auto; line-height: normal; diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css index f72f61c545..9f4083d42e 100644 --- a/WebContent/VAADIN/themes/reindeer/tree/tree.css +++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css @@ -26,9 +26,7 @@ padding-left: 16px; } .v-tree-node-caption.v-tree-node-focused span{ - padding-left: 1px; - padding-top: 0px; - padding-bottom: 0px; + padding: 0 1px; /* Make room for border */ } .v-tree-node-focused span{ border: 1px dotted black; diff --git a/WebContent/VAADIN/themes/runo/tree/tree.css b/WebContent/VAADIN/themes/runo/tree/tree.css index 14061b8afb..e897236587 100644 --- a/WebContent/VAADIN/themes/runo/tree/tree.css +++ b/WebContent/VAADIN/themes/runo/tree/tree.css @@ -34,9 +34,7 @@ outline:none; } .v-tree-node-caption.v-tree-node-focused span{ - padding-left: 1px; - padding-top: 0px; - padding-bottom: 0px; + padding: 0; } .v-tree-node-focused span{ border: 1px dotted black; |