projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/odoo/odoo
[odoo/odoo.git]
/
addons
/
web
/
static
/
src
/
css
/
base.css
diff --git
a/addons/web/static/src/css/base.css
b/addons/web/static/src/css/base.css
index
ae2bd28
..
379fc66
100644
(file)
--- a/
addons/web/static/src/css/base.css
+++ b/
addons/web/static/src/css/base.css
@@
-1041,6
+1041,9
@@
-moz-user-select: none;
user-select: none;
}
-moz-user-select: none;
user-select: none;
}
+.openerp .oe-view-manager-header .oe-button-column {
+ height: 30px;
+}
.openerp .oe-view-manager-header .dropdown-menu li {
position: relative;
}
.openerp .oe-view-manager-header .dropdown-menu li {
position: relative;
}
@@
-1098,6
+1101,9
@@
.openerp .oe-view-manager-header .oe-view-manager-search-view {
padding-top: 5px;
}
.openerp .oe-view-manager-header .oe-view-manager-search-view {
padding-top: 5px;
}
+.openerp .oe-view-manager-header .oe-view-manager-switch button {
+ width: 34px;
+}
.openerp .oe-view-manager-header .oe-view-manager-switch .oe-vm-switch-kanban:before {
content: "";
}
.openerp .oe-view-manager-header .oe-view-manager-switch .oe-vm-switch-kanban:before {
content: "";
}
@@
-1699,7
+1705,7
@@
border-right: none;
}
.openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator {
border-right: none;
}
.openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator {
- width: 108px;
+ min-width: 108px;
border-top: 1px solid #cacaca;
margin-top: 4px;
padding-top: 4px;
border-top: 1px solid #cacaca;
margin-top: 4px;
padding-top: 4px;
@@
-2022,6
+2028,10
@@
.openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
display: block;
}
.openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
display: block;
}
+.openerp .oe_form .oe_form_field_image img {
+ max-width: 256px;
+ max-height: 256px;
+}
.openerp .oe_fileupload {
display: inline-block;
clear: both;
.openerp .oe_fileupload {
display: inline-block;
clear: both;