summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2011-11-17 10:01:17 +0100
committerFabien Meghazi <fme@openerp.com>2011-11-17 10:01:17 +0100
commit42cdd75942bb03a9c2358bcd64022e1a09cd184e (patch)
tree0a99131e501672b3e784cd6dbc4e35b804432f3c /addons/web/static/src
parente58a82c2b37b3a7dcdd0a29d0208d26d6d97d01b (diff)
[FIX] Strange overflow of unwrapped text in 100% width buttons under Firefox
lp bug: https://launchpad.net/bugs/885765 fixed bzr revid: fme@openerp.com-20111117090117-m5du8bph807nhpju
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/css/base.css14
-rw-r--r--addons/web/static/src/xml/base.xml2
2 files changed, 12 insertions, 4 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 2db16ff04b2..7eb94ad2f58 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -967,17 +967,25 @@ label.error {
.openerp .oe_forms textarea {
resize:vertical;
}
-.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .button {
+.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .oe_button {
height: 22px;
}
.openerp .oe_forms input.field_datetime {
min-width: 11em;
}
-.openerp .oe_forms .button {
+.openerp .oe_forms .oe_button {
color: #4c4c4c;
white-space: nowrap;
+ min-width: 100%;
+ width: 100%;
+}
+@-moz-document url-prefix() {
+ /* Strange firefox behaviour on width: 100% + white-space: nowrap */
+ .openerp .oe_forms .oe_button {
+ width: auto;
+ }
}
-.openerp .oe_forms .button span {
+.openerp .oe_forms .oe_button span {
position: relative;
vertical-align: top;
}
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c2cb6bb814c..fb7ccdf7d8e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1081,7 +1081,7 @@
</table>
</t>
<t t-name="WidgetButton">
- <button type="button" style="width: 100%" class="button">
+ <button type="button" class="oe_button">
<img t-if="widget.node.attrs.icon" t-att-src="'/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
<span t-if="widget.string"><t t-esc="widget.string"/></span>
</button>