diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-02-28 11:17:41 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-02-28 11:17:41 +0000 |
| commit | 6fcd994f1af440fd276c23d2b0f7e9f3e7ec37e8 (patch) | |
| tree | 80a5822bb6fdde3849045fb8fe2ebe653eec2693 /WebContent | |
| parent | 7756ba04dc4fff1222ceed5a44009883daaa9e30 (diff) | |
| download | vaadin-framework-6fcd994f1af440fd276c23d2b0f7e9f3e7ec37e8.tar.gz vaadin-framework-6fcd994f1af440fd276c23d2b0f7e9f3e7ec37e8.zip | |
Merged changes from 6.5 branch
svn changeset:17493/svn branch:6.6
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/table/table.css | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/tests-tickets/styles.css | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css index fa1359912f..6061f7ee03 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.css +++ b/WebContent/VAADIN/themes/reindeer/table/table.css @@ -173,9 +173,9 @@ -webkit-border-bottom-right-radius: 4px; height: 13px; padding: 4px 30px; + white-space: nowrap; color: #222; text-shadow: #fff 0 1px 0; - width: 100px; position: relative; top: 1px; -webkit-box-shadow: rgba(0,0,0,.5) 0 1px 2px; diff --git a/WebContent/VAADIN/themes/tests-tickets/styles.css b/WebContent/VAADIN/themes/tests-tickets/styles.css index 7654f4663f..e63a5767b3 100644 --- a/WebContent/VAADIN/themes/tests-tickets/styles.css +++ b/WebContent/VAADIN/themes/tests-tickets/styles.css @@ -329,6 +329,7 @@ } .styled-twincol-captions .v-select-twincol-caption-right { font-size: 30px; + line-height: normal; color: blue; } |