diff options
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/csslayout/csslayout.css | 11 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/datefield/datefield.css | 3 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/formlayout/formlayout.css | 10 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/gridlayout/gridlayout.css | 12 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css | 12 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/styles.css | 60 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/table/table.css | 7 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/upload/upload.css | 3 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/layouts/layouts.css | 18 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/styles.css | 78 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/favicon.ico | bin | 1406 -> 1150 bytes | |||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/styles.css | 60 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/sampler-reindeer/favicon.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | WebContent/VAADIN/themes/sampler-runo/favicon.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | WebContent/WEB-INF/portlet.xml | 167 |
15 files changed, 254 insertions, 187 deletions
diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.css b/WebContent/VAADIN/themes/base/csslayout/csslayout.css index 12f1cd08fc..1f85d6f460 100644 --- a/WebContent/VAADIN/themes/base/csslayout/csslayout.css +++ b/WebContent/VAADIN/themes/base/csslayout/csslayout.css @@ -1,16 +1,15 @@ .v-csslayout { overflow: hidden; } - .v-csslayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-csslayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-csslayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-csslayout-margin-right { - padding-right: 2em; -} + padding-right: 12px; +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 720a80716f..fd2730bf24 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -51,6 +51,9 @@ .v-datefield-time .v-label { display: inline; } +.v-datefield-popup { + background: #fff; +} /* Disabled by default .v-datefield-error .v-textfield, .v-datefield-error .v-datefield-calendarpanel { diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.css b/WebContent/VAADIN/themes/base/formlayout/formlayout.css index 47ae45df52..9566ff1663 100644 --- a/WebContent/VAADIN/themes/base/formlayout/formlayout.css +++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.css @@ -15,7 +15,7 @@ .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell { - padding-top: 1em; + padding-top: 6px; } .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell, @@ -25,18 +25,18 @@ .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell { - padding-top: 2em; + padding-top: 12px; } .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell { - padding-bottom: 2em; + padding-bottom: 12px; } .v-formlayout-margin-left .v-formlayout-captioncell { - padding-left: 2em; + padding-left: 12px; } .v-formlayout-margin-right .v-formlayout-contentcell { - padding-right: 2em; + padding-right: 12px; } .v-formlayout-captioncell .v-caption .v-required-field-indicator { float: none; diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css index 039f080ac2..87cdcfd361 100644 --- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css +++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css @@ -1,18 +1,18 @@ .v-gridlayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-gridlayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-gridlayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-gridlayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-gridlayout-spacing-on { - padding-left: 1em; - padding-top: 1em; + padding-left: 6px; + padding-top: 6px; overflow: hidden; } .v-gridlayout-spacing, diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css index 6dafa2d252..9f91669385 100644 --- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css +++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css @@ -1,28 +1,28 @@ .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-orderedlayout-margin-right, .v-horizontallayout-margin-right, .v-verticallayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-orderedlayout-margin-bottom, .v-horizontallayout-margin-bottom, .v-verticallayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-orderedlayout-margin-left, .v-horizontallayout-margin-left, .v-verticallayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-orderedlayout-spacing-on, .v-horizontallayout-spacing-on, .v-verticallayout-spacing-on { - padding-top: 1em; - padding-left: 1em; + padding-top: 6px; + padding-left: 6px; } /* This can be used to define spacing if spacing is off server side */ .v-orderedlayout-spacing-off, diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 60fb294fa0..ae67ae2a7a 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -1,5 +1,5 @@ -.v-theme-version:after {content:"6_3_0_dev-20100304";} -.v-theme-version-6_3_0_dev-20100304 {display: none;} +.v-theme-version:after {content:"6_3_0_dev-20100305";} +.v-theme-version-6_3_0_dev-20100305 {display: none;} /* Automatically compiled css file from subdirectories. */ .v-absolutelayout-wrapper { @@ -484,18 +484,17 @@ div.v-app-loading { .v-csslayout { overflow: hidden; } - .v-csslayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-csslayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-csslayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-csslayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-customcomponent { @@ -559,6 +558,9 @@ div.v-app-loading { .v-datefield-time .v-label { display: inline; } +.v-datefield-popup { + background: #fff; +} /* Disabled by default .v-datefield-error .v-textfield, .v-datefield-error .v-datefield-calendarpanel { @@ -598,7 +600,7 @@ div.v-app-loading { .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell { - padding-top: 1em; + padding-top: 6px; } .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell, @@ -608,38 +610,38 @@ div.v-app-loading { .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell { - padding-top: 2em; + padding-top: 12px; } .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell { - padding-bottom: 2em; + padding-bottom: 12px; } .v-formlayout-margin-left .v-formlayout-captioncell { - padding-left: 2em; + padding-left: 12px; } .v-formlayout-margin-right .v-formlayout-contentcell { - padding-right: 2em; + padding-right: 12px; } .v-formlayout-captioncell .v-caption .v-required-field-indicator { float: none; } .v-gridlayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-gridlayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-gridlayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-gridlayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-gridlayout-spacing-on { - padding-left: 1em; - padding-top: 1em; + padding-left: 6px; + padding-top: 6px; overflow: hidden; } .v-gridlayout-spacing, @@ -796,28 +798,28 @@ div.v-app-loading { .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-orderedlayout-margin-right, .v-horizontallayout-margin-right, .v-verticallayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-orderedlayout-margin-bottom, .v-horizontallayout-margin-bottom, .v-verticallayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-orderedlayout-margin-left, .v-horizontallayout-margin-left, .v-verticallayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-orderedlayout-spacing-on, .v-horizontallayout-spacing-on, .v-verticallayout-spacing-on { - padding-top: 1em; - padding-left: 1em; + padding-top: 6px; + padding-left: 6px; } /* This can be used to define spacing if spacing is off server side */ .v-orderedlayout-spacing-off, @@ -1339,6 +1341,10 @@ div.v-progressindicator-indeterminate-disabled { .v-table-header-cell-desc .v-table-caption-container { background: transparent url(common/img/sprites.png) no-repeat right -10px; } +.v-table-caption-container .v-icon, +.v-table-header-drag .v-icon { + vertical-align: middle; +} .v-table-body { border: 1px solid #aaa; } @@ -1403,6 +1409,9 @@ div.v-progressindicator-indeterminate-disabled { margin-top: 20px; z-index: 30000; } +.v-table-header-drag .v-icon { + vertical-align: middle; +} .v-table-scrollposition { width: 160px; background: #eee; @@ -1694,7 +1703,10 @@ div.v-tree-node-leaf { right: 0; height: 21px; text-align: right; + border: none; + background: transparent; } + .v-upload-immediate button { position: relative; left: 0; diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index 213d090b52..e26d3aa22c 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -72,6 +72,10 @@ .v-table-header-cell-desc .v-table-caption-container { background: transparent url(../common/img/sprites.png) no-repeat right -10px; } +.v-table-caption-container .v-icon, +.v-table-header-drag .v-icon { + vertical-align: middle; +} .v-table-body { border: 1px solid #aaa; } @@ -136,6 +140,9 @@ margin-top: 20px; z-index: 30000; } +.v-table-header-drag .v-icon { + vertical-align: middle; +} .v-table-scrollposition { width: 160px; background: #eee; diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css index 73f9490738..eb5a300296 100644 --- a/WebContent/VAADIN/themes/base/upload/upload.css +++ b/WebContent/VAADIN/themes/base/upload/upload.css @@ -12,7 +12,10 @@ right: 0; height: 21px; text-align: right; + border: none; + background: transparent; } + .v-upload-immediate button { position: relative; left: 0; diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.css b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css index 1699baddf7..5920830086 100644 --- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.css +++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css @@ -24,6 +24,24 @@ padding-top: 7px; padding-left: 6px; } +/* Different for historical reasons: previously was inherited directly from Base theme */ +/* TODO unify these values in version 7 */ +.v-gridlayout-margin-top { + padding-top: 24px; +} +.v-gridlayout-margin-bottom { + padding-bottom: 24px; +} +.v-gridlayout-margin-left { + padding-left: 24px; +} +.v-gridlayout-margin-right { + padding-right: 24px; +} +.v-gridlayout-spacing-on { + padding-left: 12px; + padding-top: 12px; +} /* Blue background */ .v-verticallayout-blue, .v-horizontallayout-blue, diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index c2df4128e4..60451c64c7 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -1,5 +1,5 @@ -.v-theme-version:after {content:"6_3_0_dev-20100304";} -.v-theme-version-6_3_0_dev-20100304 {display: none;} +.v-theme-version:after {content:"6_3_0_dev-20100305";} +.v-theme-version-6_3_0_dev-20100305 {display: none;} /* Automatically compiled css file from subdirectories. */ .v-absolutelayout-wrapper { @@ -484,18 +484,17 @@ div.v-app-loading { .v-csslayout { overflow: hidden; } - .v-csslayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-csslayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-csslayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-csslayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-customcomponent { @@ -559,6 +558,9 @@ div.v-app-loading { .v-datefield-time .v-label { display: inline; } +.v-datefield-popup { + background: #fff; +} /* Disabled by default .v-datefield-error .v-textfield, .v-datefield-error .v-datefield-calendarpanel { @@ -598,7 +600,7 @@ div.v-app-loading { .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell { - padding-top: 1em; + padding-top: 6px; } .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell, @@ -608,38 +610,38 @@ div.v-app-loading { .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell { - padding-top: 2em; + padding-top: 12px; } .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell { - padding-bottom: 2em; + padding-bottom: 12px; } .v-formlayout-margin-left .v-formlayout-captioncell { - padding-left: 2em; + padding-left: 12px; } .v-formlayout-margin-right .v-formlayout-contentcell { - padding-right: 2em; + padding-right: 12px; } .v-formlayout-captioncell .v-caption .v-required-field-indicator { float: none; } .v-gridlayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-gridlayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-gridlayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-gridlayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-gridlayout-spacing-on { - padding-left: 1em; - padding-top: 1em; + padding-left: 6px; + padding-top: 6px; overflow: hidden; } .v-gridlayout-spacing, @@ -796,28 +798,28 @@ div.v-app-loading { .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-orderedlayout-margin-right, .v-horizontallayout-margin-right, .v-verticallayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-orderedlayout-margin-bottom, .v-horizontallayout-margin-bottom, .v-verticallayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-orderedlayout-margin-left, .v-horizontallayout-margin-left, .v-verticallayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-orderedlayout-spacing-on, .v-horizontallayout-spacing-on, .v-verticallayout-spacing-on { - padding-top: 1em; - padding-left: 1em; + padding-top: 6px; + padding-left: 6px; } /* This can be used to define spacing if spacing is off server side */ .v-orderedlayout-spacing-off, @@ -1339,6 +1341,10 @@ div.v-progressindicator-indeterminate-disabled { .v-table-header-cell-desc .v-table-caption-container { background: transparent url(../base/common/img/sprites.png) no-repeat right -10px; } +.v-table-caption-container .v-icon, +.v-table-header-drag .v-icon { + vertical-align: middle; +} .v-table-body { border: 1px solid #aaa; } @@ -1403,6 +1409,9 @@ div.v-progressindicator-indeterminate-disabled { margin-top: 20px; z-index: 30000; } +.v-table-header-drag .v-icon { + vertical-align: middle; +} .v-table-scrollposition { width: 160px; background: #eee; @@ -1694,7 +1703,10 @@ div.v-tree-node-leaf { right: 0; height: 21px; text-align: right; + border: none; + background: transparent; } + .v-upload-immediate button { position: relative; left: 0; @@ -3133,6 +3145,24 @@ td.v-datefield-calendarpanel-nextyear { padding-top: 7px; padding-left: 6px; } +/* Different for historical reasons: previously was inherited directly from Base theme */ +/* TODO unify these values in version 7 */ +.v-gridlayout-margin-top { + padding-top: 24px; +} +.v-gridlayout-margin-bottom { + padding-bottom: 24px; +} +.v-gridlayout-margin-left { + padding-left: 24px; +} +.v-gridlayout-margin-right { + padding-right: 24px; +} +.v-gridlayout-spacing-on { + padding-left: 12px; + padding-top: 12px; +} /* Blue background */ .v-verticallayout-blue, .v-horizontallayout-blue, diff --git a/WebContent/VAADIN/themes/runo/favicon.ico b/WebContent/VAADIN/themes/runo/favicon.ico Binary files differindex 2c731f8f85..e58158c02c 100644 --- a/WebContent/VAADIN/themes/runo/favicon.ico +++ b/WebContent/VAADIN/themes/runo/favicon.ico diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index cf6236a886..493a7ea8eb 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -1,5 +1,5 @@ -.v-theme-version:after {content:"6_3_0_dev-20100304";} -.v-theme-version-6_3_0_dev-20100304 {display: none;} +.v-theme-version:after {content:"6_3_0_dev-20100305";} +.v-theme-version-6_3_0_dev-20100305 {display: none;} /* Automatically compiled css file from subdirectories. */ .v-absolutelayout-wrapper { @@ -484,18 +484,17 @@ div.v-app-loading { .v-csslayout { overflow: hidden; } - .v-csslayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-csslayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-csslayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-csslayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-customcomponent { @@ -559,6 +558,9 @@ div.v-app-loading { .v-datefield-time .v-label { display: inline; } +.v-datefield-popup { + background: #fff; +} /* Disabled by default .v-datefield-error .v-textfield, .v-datefield-error .v-datefield-calendarpanel { @@ -598,7 +600,7 @@ div.v-app-loading { .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell { - padding-top: 1em; + padding-top: 6px; } .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell, @@ -608,38 +610,38 @@ div.v-app-loading { .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell { - padding-top: 2em; + padding-top: 12px; } .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell { - padding-bottom: 2em; + padding-bottom: 12px; } .v-formlayout-margin-left .v-formlayout-captioncell { - padding-left: 2em; + padding-left: 12px; } .v-formlayout-margin-right .v-formlayout-contentcell { - padding-right: 2em; + padding-right: 12px; } .v-formlayout-captioncell .v-caption .v-required-field-indicator { float: none; } .v-gridlayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-gridlayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-gridlayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-gridlayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-gridlayout-spacing-on { - padding-left: 1em; - padding-top: 1em; + padding-left: 6px; + padding-top: 6px; overflow: hidden; } .v-gridlayout-spacing, @@ -796,28 +798,28 @@ div.v-app-loading { .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-orderedlayout-margin-right, .v-horizontallayout-margin-right, .v-verticallayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-orderedlayout-margin-bottom, .v-horizontallayout-margin-bottom, .v-verticallayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-orderedlayout-margin-left, .v-horizontallayout-margin-left, .v-verticallayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-orderedlayout-spacing-on, .v-horizontallayout-spacing-on, .v-verticallayout-spacing-on { - padding-top: 1em; - padding-left: 1em; + padding-top: 6px; + padding-left: 6px; } /* This can be used to define spacing if spacing is off server side */ .v-orderedlayout-spacing-off, @@ -1339,6 +1341,10 @@ div.v-progressindicator-indeterminate-disabled { .v-table-header-cell-desc .v-table-caption-container { background: transparent url(../base/common/img/sprites.png) no-repeat right -10px; } +.v-table-caption-container .v-icon, +.v-table-header-drag .v-icon { + vertical-align: middle; +} .v-table-body { border: 1px solid #aaa; } @@ -1403,6 +1409,9 @@ div.v-progressindicator-indeterminate-disabled { margin-top: 20px; z-index: 30000; } +.v-table-header-drag .v-icon { + vertical-align: middle; +} .v-table-scrollposition { width: 160px; background: #eee; @@ -1694,7 +1703,10 @@ div.v-tree-node-leaf { right: 0; height: 21px; text-align: right; + border: none; + background: transparent; } + .v-upload-immediate button { position: relative; left: 0; diff --git a/WebContent/VAADIN/themes/sampler-reindeer/favicon.ico b/WebContent/VAADIN/themes/sampler-reindeer/favicon.ico Binary files differnew file mode 100644 index 0000000000..e58158c02c --- /dev/null +++ b/WebContent/VAADIN/themes/sampler-reindeer/favicon.ico diff --git a/WebContent/VAADIN/themes/sampler-runo/favicon.ico b/WebContent/VAADIN/themes/sampler-runo/favicon.ico Binary files differnew file mode 100644 index 0000000000..e58158c02c --- /dev/null +++ b/WebContent/VAADIN/themes/sampler-runo/favicon.ico diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index b1a6d4722d..bab08d4eb1 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -2,7 +2,7 @@ <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> - + <portlet> <portlet-name>PortletDemoPortlet</portlet-name> <display-name>Vaadin PortletDemo</display-name> @@ -120,7 +120,7 @@ <role-name>user</role-name> </security-role-ref> </portlet> - + <portlet> <portlet-name>HelloWorldPortlet</portlet-name> <display-name>Hello World</display-name> @@ -136,92 +136,75 @@ <portlet-info> <title>HelloWorld</title> <short-title>HelloWorld</short-title> - </portlet-info> + </portlet-info> </portlet> - <!-- - <portlet> - <portlet-name>VaadinInterPortletEventPortlet</portlet-name> + <!-- + <portlet> <portlet-name>VaadinInterPortletEventPortlet</portlet-name> <display-name>Hello World Event</display-name> <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class> - <init-param> - <name>application</name> - <value>com.vaadin.demo.portlet.VaadinInterPortletEventPortlet</value> - </init-param> - <init-param> - <name>widgetset</name> - <value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>view</portlet-mode> - </supports> - <portlet-info> - <title>Inter-portlet events</title> - <short-title>Inter-portlet events</short-title> - </portlet-info> - <supported-processing-event> - <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname> - </supported-processing-event> - <supported-processing-event> - <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname> - </supported-processing-event> - <supported-publishing-event> - <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname> - </supported-publishing-event> - <supported-publishing-event> - <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname> + <init-param> <name>application</name> + <value>com.vaadin.demo.portlet.VaadinInterPortletEventPortlet</value> + </init-param> <init-param> <name>widgetset</name> + <value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value> + </init-param> <supports> <mime-type>text/html</mime-type> + <portlet-mode>view</portlet-mode> </supports> <portlet-info> + <title>Inter-portlet events</title> <short-title>Inter-portlet + events</short-title> </portlet-info> <supported-processing-event> + <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname> + </supported-processing-event> <supported-processing-event> <qname + xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname> + </supported-processing-event> <supported-publishing-event> <qname + xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname> + </supported-publishing-event> <supported-publishing-event> <qname + xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname> </supported-publishing-event> - <supported-public-render-parameter>HelloState</supported-public-render-parameter> - </portlet> - - <portlet> + <supported-public-render-parameter>HelloState</supported-public-render-parameter> + </portlet> <portlet> <portlet-name>InterPortletEventPortlet</portlet-name> <display-name>Hello World Event (non-Vaadin)</display-name> <portlet-class>com.vaadin.demo.portlet.InterPortletEventPortlet</portlet-class> + <supports> <mime-type>text/html</mime-type> + <portlet-mode>view</portlet-mode> </supports> <portlet-info> + <title>Inter-portlet events (non-Vaadin)</title> + <short-title>Inter-portlet events (non-Vaadin)</short-title> + </portlet-info> <supported-processing-event> <qname + xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname> + </supported-processing-event> <supported-processing-event> <qname + xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname> + </supported-processing-event> <supported-publishing-event> <qname + xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname> + </supported-publishing-event> <supported-publishing-event> <qname + xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname> + </supported-publishing-event> + <supported-public-render-parameter>HelloState</supported-public-render-parameter> + </portlet> + --> + <portlet> + <portlet-name>Portlet Mode Example</portlet-name> + <display-name>Portlet Mode Example</display-name> + <portlet-class>com.vaadin.demo.portlet.PortletModePortlet</portlet-class> + <init-param> + <name>widgetset</name> + <value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value> + </init-param> + <init-param> + <name>application</name> + <value>com.vaadin.demo.portlet.PortletModeExample</value> + </init-param> + <supports> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> + <portlet-mode>edit</portlet-mode> + <portlet-mode>help</portlet-mode> + <portlet-mode>config</portlet-mode> </supports> <portlet-info> - <title>Inter-portlet events (non-Vaadin)</title> - <short-title>Inter-portlet events (non-Vaadin)</short-title> + <title>PortletModeExample</title> + <short-title>PortletModeExample</short-title> </portlet-info> - <supported-processing-event> - <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname> - </supported-processing-event> - <supported-processing-event> - <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname> - </supported-processing-event> - <supported-publishing-event> - <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname> - </supported-publishing-event> - <supported-publishing-event> - <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname> - </supported-publishing-event> - <supported-public-render-parameter>HelloState</supported-public-render-parameter> </portlet> - --> - <portlet> - <portlet-name>Portlet Mode Example</portlet-name> - <display-name>Portlet Mode Example</display-name> - <portlet-class>com.vaadin.demo.portlet.PortletModePortlet</portlet-class> - <init-param> - <name>widgetset</name> - <value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>view</portlet-mode> - <portlet-mode>edit</portlet-mode> - <portlet-mode>help</portlet-mode> - <portlet-mode>config</portlet-mode> - </supports> - <portlet-info> - <title>PortletModeExample</title> - <short-title>PortletModeExample</short-title> - </portlet-info> - </portlet> <portlet> <portlet-name>AddressBookPortlet</portlet-name> @@ -238,9 +221,9 @@ <portlet-info> <title>Address Book</title> <short-title>Address Book</short-title> - </portlet-info> - </portlet> - + </portlet-info> + </portlet> + <portlet> <portlet-name>SamplerPortlet</portlet-name> <display-name>Sampler</display-name> @@ -260,9 +243,9 @@ <portlet-info> <title>Sampler</title> <short-title>Sampler</short-title> - </portlet-info> + </portlet-info> </portlet> - + <portlet> <portlet-name>CalcPortlet</portlet-name> <display-name>Calc</display-name> @@ -274,7 +257,7 @@ <init-param> <name>widgetset</name> <value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value> - </init-param> + </init-param> <supports> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> @@ -282,8 +265,8 @@ <portlet-info> <title>Calc</title> <short-title>Calc</short-title> - </portlet-info> - </portlet> + </portlet-info> + </portlet> <portlet> <portlet-name>ChatServletPortlet</portlet-name> <display-name>Vaadin ChatServlet</display-name> @@ -361,23 +344,23 @@ <role-name>user</role-name> </security-role-ref> </portlet> - + <!-- Used by the Portlet mode demo --> - <custom-portlet-mode> - <description>Custom mode</description> - <portlet-mode>config</portlet-mode> - <portal-managed>false</portal-managed> - </custom-portlet-mode> + <custom-portlet-mode> + <description>Custom mode</description> + <portlet-mode>config</portlet-mode> + <portal-managed>false</portal-managed> + </custom-portlet-mode> <!-- - These can be used to customize the event object types. - The types must be serializable and have JAXB binding. + These can be used to customize the event object types. The types must + be serializable and have JAXB binding. --> <event-definition> <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname> <value-type>java.lang.String</value-type> - </event-definition> - + </event-definition> + <event-definition> <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname> <value-type>java.lang.String</value-type> @@ -387,7 +370,7 @@ <identifier>HelloState</identifier> <qname xmlns:vaadin="http://www.vaadin.com/params">vaadin:HelloState</qname> </public-render-parameter> - + <!-- This can be used to work around an issue in liferay 5.0-5.1.1 |