summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/chameleon
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2011-12-22 16:00:52 +0200
committerHenri Sara <hesara@vaadin.com>2011-12-22 16:00:52 +0200
commitc6cc203ec360f9efbfb116029ca855a28c7bfa63 (patch)
tree8448edb2b703462edda6120ce888531cdba6710c /WebContent/VAADIN/themes/chameleon
parent227941bc6248fd4fb70bba3255d3920c3737a1f8 (diff)
parent02daee926e0bb40bcd8a321a2a27570da5c9c928 (diff)
downloadvaadin-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/VAADIN/themes/chameleon')
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/button/button.css4
1 files changed, 2 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
+ }