summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@openerp.com>2013-02-24 10:46:16 +0100
committerFabien Pinckaers <fp@openerp.com>2013-02-24 10:46:16 +0100
commit6c3a754e07d65e6a6bef6793bb852586e7bdfdff (patch)
treea4db90fabed416b92b0d07d6e355f695e7ad3d4d /addons/web/static
parent96e97f7624f90d1870622d11f9980a640d696f61 (diff)
parentf05be9414283636214e64f42672f4ea492ee5b3f (diff)
[IMP] firefox layout issues
bzr revid: fp@openerp.com-20130224094616-n2o57txk39q97e1m
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/src/css/base.css27
-rw-r--r--addons/web/static/src/css/base.sass16
-rw-r--r--addons/web/static/src/js/view_form.js11
3 files changed, 47 insertions, 7 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index be26b7edd70..018f9f7bbe4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1263,7 +1263,7 @@
color: white;
padding: 2px 4px;
margin: 1px 6px 0 0;
- border: 1px solid lightgrey;
+ border: 1px solid lightGray;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -1295,7 +1295,7 @@
transform: scale(1.1);
}
.openerp .oe_secondary_submenu .oe_active {
- border-top: 1px solid lightgrey;
+ border-top: 1px solid lightGray;
border-bottom: 1px solid #dedede;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2257,7 +2257,7 @@
}
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
font-size: 80%;
- color: darkgreen;
+ color: darkGreen;
vertical-align: top;
position: relative;
top: -4px;
@@ -2329,6 +2329,7 @@
width: 100%;
display: inline-block;
padding: 2px 2px 2px 0px;
+ vertical-align: top;
}
.openerp .oe_form .oe_form_field input {
margin: 0px;
@@ -2372,7 +2373,6 @@
white-space: nowrap;
}
.openerp .oe_form .oe_form_field_boolean {
- padding-top: 4px;
width: auto;
}
.openerp .oe_form .oe_datepicker_container {
@@ -3094,6 +3094,24 @@
color: #333333;
}
+@-moz-document url-prefix() {
+ .openerp .oe_view_manager .oe_view_manager_switch li {
+ line-height: 21px;
+ }
+ .openerp .oe_searchview .oe_searchview_search {
+ top: -1px;
+ }
+ .openerp .oe_form_field_many2one .oe_m2o_cm_button {
+ line-height: 18px;
+ }
+ .openerp .oe_secondary_submenu {
+ line-height: 14px;
+ }
+ .openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off {
+ top: 0px;
+ }
+}
+
.kitten-mode-activated {
background-size: cover;
background-attachment: fixed;
@@ -3313,6 +3331,7 @@ div.ui-widget-overlay {
overflow: hidden !important;
}
}
+
.blockUI.blockOverlay {
background-color: black;
opacity: 0.6;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b308b825775..0a73728678d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1849,6 +1849,7 @@ $sheet-padding: 16px
width: 100%
display: inline-block
padding: 2px 2px 2px 0px
+ vertical-align: top
input
margin: 0px
input[type="text"], input[type="password"], input[type="file"], select
@@ -1876,7 +1877,6 @@ $sheet-padding: 16px
.oe_form_field_datetime
white-space: nowrap
.oe_form_field_boolean
- padding-top: 4px
width: auto
.oe_datepicker_container
display: none
@@ -2438,6 +2438,20 @@ $sheet-padding: 16px
float: right
color: #333
// }}}
+@-moz-document url-prefix()
+ .openerp
+ .oe_view_manager .oe_view_manager_switch li
+ line-height: 21px
+ .oe_searchview .oe_searchview_search
+ top: -1px
+ .oe_form_field_many2one .oe_m2o_cm_button
+ line-height: 18px
+ .oe_secondary_submenu
+ line-height: 14px
+ .oe_webclient
+ .oe_star_on, .oe_star_off
+ top: 0px
+
// Kitten Mode {{{
.kitten-mode-activated
background-size: cover
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a023dd54174..e84c21017b5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3052,9 +3052,9 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.$input.keydown(input_changed);
this.$input.change(input_changed);
this.$drop_down.click(function() {
+ self.$input.focus();
if (self.$input.autocomplete("widget").is(":visible")) {
- self.$input.autocomplete("close");
- self.$input.focus();
+ self.$input.autocomplete("close");
} else {
if (self.get("value") && ! self.floating) {
self.$input.autocomplete("search", "");
@@ -4099,6 +4099,13 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
focus: function () {
this.$text[0].focus();
},
+ set_dimensions: function (height, width) {
+ this._super(height, width);
+ this.$("textarea").css({
+ width: width,
+ minHeight: height
+ });
+ },
});
/**