[MERGE] from master

[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 8ddb382..dab5a78 100644 (file)
--- 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");
@@ -1041,6 +1042,9 @@
   -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;
 }
@@ -1155,14 +1159,24 @@
 .openerp .oe-view-manager-header .oe_form_buttons {
   padding: 0;
 }
+.openerp .oe-view-manager-header .oe_form_buttons_view > button {
+  float: left;
+}
+.openerp .oe-view-manager-header .oe_form_buttons_view > button:last-child {
+  float: right;
+  margin-left: 4px;
+}
 .openerp .oe-view-manager-header .oe-pager-buttons {
   min-height: 30px;
 }
 .openerp .oe_view_manager_inline > .oe-view-manager-header, .openerp .oe_view_manager_inlineview > .oe-view-manager-header {
   display: none;
 }
+.openerp .o-modal-header > div {
+  margin-left: 45%;
+}
 .openerp .oe_popup_form {
-  display: table;
+  display: none;
 }
 .openerp .oe_popup_form .oe_formview .oe_form_pager {
   display: none !important;
@@ -1358,6 +1372,10 @@
 .openerp .oe-search-options .divider {
   display: none;
 }
+.openerp .oe-search-options .filters-menu {
+  overflow: auto;
+  overflow-x: hidden;
+}
 .openerp .oe-search-options .filters-menu .divider {
   display: list-item;
 }
@@ -1685,7 +1703,7 @@
   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;
@@ -2008,6 +2026,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;
@@ -2746,6 +2768,7 @@
     top: 0px;
   }
 }
+
 .kitten-mode-activated {
   background-size: cover;
   background-attachment: fixed;
@@ -3082,8 +3105,21 @@ body.oe_single_form .oe_single_form_container {
   font-size: 20px;
 }
 .modal .modal-body {
-  overflow-x: auto;
-  min-height: 200px;
+  overflow: auto;
+  padding: 0;
+}
+.modal .modal-body .oe_application {
+  width: 100%;
+}
+.modal .modal-body .oe_popup_list {
+  display: none;
+  min-height: 150px;
+}
+.modal .modal-body .oe-view-manager {
+  min-height: 150px;
+}
+.modal .modal-body .oe_form_sheetbg .oe_form_sheet {
+  padding: 0;
 }
 .modal .modal-footer {
   text-align: left;
@@ -3100,8 +3136,8 @@ body.oe_single_form .oe_single_form_container {
 
 @media (min-width: 768px) {
   .modal .modal-body {
-    max-height: -webkit-calc(100vh - 200px);
-    max-height: calc(100vh - 200px);
+    max-height: -webkit-calc(100vh - 170px);
+    max-height: calc(100vh - 170px);
   }
 }
 .ui-datepicker {