diff options
| author | Henri Sara <hesara@vaadin.com> | 2011-12-22 16:00:52 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2011-12-22 16:00:52 +0200 |
| commit | c6cc203ec360f9efbfb116029ca855a28c7bfa63 (patch) | |
| tree | 8448edb2b703462edda6120ce888531cdba6710c /WebContent | |
| parent | 227941bc6248fd4fb70bba3255d3920c3737a1f8 (diff) | |
| parent | 02daee926e0bb40bcd8a321a2a27570da5c9c928 (diff) | |
| download | vaadin-framework-c6cc203ec360f9efbfb116029ca855a28c7bfa63.tar.gz vaadin-framework-c6cc203ec360f9efbfb116029ca855a28c7bfa63.zip | |
Merge remote branch 'origin/6.8'
Conflicts:
tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/button/button.css | 4 | ||||
| -rw-r--r-- | WebContent/release-notes.html | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/components/button/button.css b/WebContent/VAADIN/themes/chameleon/components/button/button.css index 6629cfeb1e..1dffddb4c2 100644 --- a/WebContent/VAADIN/themes/chameleon/components/button/button.css +++ b/WebContent/VAADIN/themes/chameleon/components/button/button.css @@ -163,7 +163,7 @@ body.v-ie .v-pressed.v-button-borderless { font-weight: normal; text-shadow: none; border: none; - padding: 1px; + margin: 1px; -webkit-box-shadow: none; -moz-box-shadow: none; } @@ -254,4 +254,4 @@ body.v-ie .v-pressed.v-button-borderless .v-button-wrap { .v-button-icon-only .v-icon { margin-right: -.5em; - }
\ No newline at end of file + } diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index 6c26efd791..2fe8083556 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -469,6 +469,8 @@ <li>Liferay Portal 5.2-6.0</li> <li>GateIn Portal 3.1</li> <li>eXo Platform 3</li> + <li>Oracle WebLogic® Portal 10gR3</li> + <li>WebSphere Portal 6.1-7.0</li> </ul> <p> Vaadin also supports <b>Google App Engine</b>. @@ -485,6 +487,16 @@ <li>Google Chrome 13-15</li> </ul> + <p> + Vaadin supports the built-in browsers in the following <b>mobile operating + systems</b>: + </p> + + <ul> + <li>iOS 4-5</li> + <li>Android 2-3</li> + </ul> + <h2 id="vaadinontheweb">Vaadin on the Web</h2> <p> <ul> |