summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>2014-09-24 18:51:30 +0200
committerFrédéric van der Essen <fvdessen@gmail.com>2014-11-25 17:10:11 +0100
commitc873bcb71b10de29a70b947f93b7b180472c878b (patch)
tree0fc39a85e6c6f5ba7366b1b1f148d7c71edb611c /addons/web/static/src
parent3ec6b7cb52ded1db27dfaff6a7a1c075a39e4679 (diff)
[WIP] pos_restaurant & point_of_sale : floor plan editor in the pos
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/css/base.css6
-rw-r--r--addons/web/static/src/css/base.sass3
2 files changed, 9 insertions, 0 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ae2bd2882da..3ec0404d223 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -8,6 +8,7 @@
font-weight: normal;
font-style: normal;
}
+
@font-face {
font-family: "EntypoRegular";
src: url("/web/static/src/font/entypo-webfont.eot") format("eot");
@@ -2022,6 +2023,10 @@
.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;
@@ -2760,6 +2765,7 @@
top: 0px;
}
}
+
.kitten-mode-activated {
background-size: cover;
background-attachment: fixed;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2e6e28b6dbf..5bbbc6bdf2e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1691,6 +1691,9 @@ $sheet-padding: 16px
@include box-sizing(border)
&:hover .oe_form_field_image_controls
display: block
+ img
+ max-width: 256px
+ max-height: 256px
.oe_fileupload
display: inline-block
clear: both