diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-11-08 17:36:53 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-11-08 17:36:53 +0200 |
| commit | 3159f00229ba88797142c8888d7a68344371dae7 (patch) | |
| tree | 3b597fd8c5a35cc44c89597ca76c0062255daeea /WebContent | |
| parent | 33f6d6e23d7d52368db993ae7f5b105e8f369dfe (diff) | |
| parent | 2eff8c02aba3d9dc0dd74b0aff9c114a3dc29201 (diff) | |
| download | vaadin-framework-3159f00229ba88797142c8888d7a68344371dae7.tar.gz vaadin-framework-3159f00229ba88797142c8888d7a68344371dae7.zip | |
Merge branch 'master' into windowing
Diffstat (limited to 'WebContent')
14 files changed, 4 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/common/img/ajax-loader.gif b/WebContent/VAADIN/themes/base/common/img/ajax-loader.gif Binary files differindex 354dc4685c..354dc4685c 100755..100644 --- a/WebContent/VAADIN/themes/base/common/img/ajax-loader.gif +++ b/WebContent/VAADIN/themes/base/common/img/ajax-loader.gif diff --git a/WebContent/VAADIN/themes/base/common/img/loading-indicator-delay.gif b/WebContent/VAADIN/themes/base/common/img/loading-indicator-delay.gif Binary files differindex 48810bb064..48810bb064 100755..100644 --- a/WebContent/VAADIN/themes/base/common/img/loading-indicator-delay.gif +++ b/WebContent/VAADIN/themes/base/common/img/loading-indicator-delay.gif diff --git a/WebContent/VAADIN/themes/base/common/img/loading-indicator-wait.gif b/WebContent/VAADIN/themes/base/common/img/loading-indicator-wait.gif Binary files differindex 5f7aab9afd..5f7aab9afd 100755..100644 --- a/WebContent/VAADIN/themes/base/common/img/loading-indicator-wait.gif +++ b/WebContent/VAADIN/themes/base/common/img/loading-indicator-wait.gif diff --git a/WebContent/VAADIN/themes/reindeer-tests/styles.css b/WebContent/VAADIN/themes/reindeer-tests/styles.css new file mode 100644 index 0000000000..7d1727d4ca --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer-tests/styles.css @@ -0,0 +1,4 @@ +@import url(../reindeer/styles.css); + +.table-equal-rowheight .v-table-row {height: 30px;} +.table-equal-rowheight .v-table-row-odd {height: 30px;}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/accordion/img/collapsed-icon.png b/WebContent/VAADIN/themes/runo/accordion/img/collapsed-icon.png Binary files differindex dc13f0f786..dc13f0f786 100755..100644 --- a/WebContent/VAADIN/themes/runo/accordion/img/collapsed-icon.png +++ b/WebContent/VAADIN/themes/runo/accordion/img/collapsed-icon.png diff --git a/WebContent/VAADIN/themes/runo/accordion/img/expanded-icon.png b/WebContent/VAADIN/themes/runo/accordion/img/expanded-icon.png Binary files differindex 0ad8eb074f..0ad8eb074f 100755..100644 --- a/WebContent/VAADIN/themes/runo/accordion/img/expanded-icon.png +++ b/WebContent/VAADIN/themes/runo/accordion/img/expanded-icon.png diff --git a/WebContent/VAADIN/themes/runo/accordion/img/selected-bg.png b/WebContent/VAADIN/themes/runo/accordion/img/selected-bg.png Binary files differindex 1c599db14e..1c599db14e 100755..100644 --- a/WebContent/VAADIN/themes/runo/accordion/img/selected-bg.png +++ b/WebContent/VAADIN/themes/runo/accordion/img/selected-bg.png diff --git a/WebContent/VAADIN/themes/runo/icons/16/error.png b/WebContent/VAADIN/themes/runo/icons/16/error.png Binary files differindex 0141e4dfc3..0141e4dfc3 100755..100644 --- a/WebContent/VAADIN/themes/runo/icons/16/error.png +++ b/WebContent/VAADIN/themes/runo/icons/16/error.png diff --git a/WebContent/VAADIN/themes/runo/slider/img/handle-horizontal.png b/WebContent/VAADIN/themes/runo/slider/img/handle-horizontal.png Binary files differindex 620b86f1da..620b86f1da 100755..100644 --- a/WebContent/VAADIN/themes/runo/slider/img/handle-horizontal.png +++ b/WebContent/VAADIN/themes/runo/slider/img/handle-horizontal.png diff --git a/WebContent/VAADIN/themes/runo/slider/img/handle-vertical.png b/WebContent/VAADIN/themes/runo/slider/img/handle-vertical.png Binary files differindex b7f63b91b7..b7f63b91b7 100755..100644 --- a/WebContent/VAADIN/themes/runo/slider/img/handle-vertical.png +++ b/WebContent/VAADIN/themes/runo/slider/img/handle-vertical.png diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/au.gif b/WebContent/VAADIN/themes/tests-tickets/icons/au.gif Binary files differindex 5269c6a0e0..5269c6a0e0 100755..100644 --- a/WebContent/VAADIN/themes/tests-tickets/icons/au.gif +++ b/WebContent/VAADIN/themes/tests-tickets/icons/au.gif diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif b/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif Binary files differindex 8d3a191828..8d3a191828 100755..100644 --- a/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif +++ b/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif b/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif Binary files differindex 6142d86817..6142d86817 100755..100644 --- a/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif +++ b/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/se.gif b/WebContent/VAADIN/themes/tests-tickets/icons/se.gif Binary files differindex 80f6285228..80f6285228 100755..100644 --- a/WebContent/VAADIN/themes/tests-tickets/icons/se.gif +++ b/WebContent/VAADIN/themes/tests-tickets/icons/se.gif |
