[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 c556fbc..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");
@@ -82,12 +83,17 @@
    */
 }
 .openerp.openerp_webclient_container {
+  height: 95%;
+  height: -webkit-calc(100% - 34px);
   height: calc(100% - 34px);
   display: -ms-flexbox;
+  display: -webkit-flex;
   display: flex;
 }
 @media (max-width: 768px) {
   .openerp.openerp_webclient_container {
+    height: 95%;
+    height: -webkit-calc(100% - 52px);
     height: calc(100% - 52px);
   }
 }
@@ -487,17 +493,17 @@
 .openerp .oe_button.oe_link span:hover {
   text-decoration: underline;
 }
-.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off {
+.openerp .oe_star_on, .openerp .oe_star_off {
   color: #cccccc;
   text-shadow: 0 0 2px black;
   vertical-align: top;
   position: relative;
   top: -8px;
 }
-.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover {
+.openerp .oe_star_on:hover, .openerp .oe_star_off:hover {
   text-decoration: none;
 }
-.openerp .oe_webclient .oe_star_on {
+.openerp .oe_star_on {
   color: gold;
 }
 .openerp p.oe_grey {
@@ -786,11 +792,6 @@
 .openerp .oe_database_manager .oe_database_manager_menu {
   color: #000;
 }
-.openerp .oe_webclient {
-  width: 100%;
-  height: 100%;
-  border-spacing: 0px;
-}
 .openerp .oe_content_full_screen .oe_application {
   top: 0;
   left: 0;
@@ -800,12 +801,17 @@
 }
 .openerp .oe_leftbar {
   display: -ms-flexbox;
+  display: -webkit-flex;
   display: flex;
   -ms-flex-direction: column;
+  -webkit-flex-direction: column;
   flex-direction: column;
+  -webkit-justify-content: space-between;
   justify-content: space-between;
   -ms-flex: 0 0 auto;
+  -webkit-flex-shrink: 0;
   flex-shrink: 0;
+  -webkit-flex-grow: 0;
   flex-grow: 0;
   width: 220px;
   height: 100%;
@@ -817,6 +823,7 @@
 }
 .openerp .oe_leftbar a.oe_logo {
   text-align: center;
+  -webkit-flex-shrink: 0;
   flex-shrink: 0;
 }
 .openerp .oe_leftbar a.oe_logo img {
@@ -842,12 +849,14 @@
   display: block;
 }
 .openerp .oe_leftbar .oe_secondary_menus_container {
+  -webkit-flex-grow: 1;
   flex-grow: 1;
   overflow-y: auto;
 }
 .openerp .oe_leftbar .oe_footer {
   background: #f0eeee;
   text-align: center;
+  -webkit-flex-shrink: 0;
   flex-shrink: 0;
 }
 .openerp .oe_leftbar .oe_footer a {
@@ -979,10 +988,12 @@
 }
 .openerp .oe_application {
   height: 100%;
+  -webkit-flex-grow: 1;
   flex-grow: 1;
   -ms-flex-negative: 1;
   display: inline-block\9;
   overflow: auto\9;
+  width: -webkit-calc(100% - 220px);
   width: calc(100% - 220px);
 }
 .openerp .oe_application .oe_application {
@@ -991,14 +1002,20 @@
 .openerp .oe-view-manager {
   width: 100%;
   height: 100%;
+  display: -webkit-flex;
   display: flex;
+  -webkit-flex-direction: column;
   flex-direction: column;
 }
 .openerp .oe-view-manager .oe-view-manager-content {
   overflow: auto;
+  -webkit-flex-grow: 1;
   flex-grow: 1;
   position: relative;
 }
+.openerp .oe-view-manager .oe-view-manager-content a {
+  color: #7C7BAD;
+}
 .openerp .oe-view-manager .oe-view-manager-content > div {
   position: absolute;
   position: static\9;
@@ -1018,12 +1035,16 @@
 .openerp .oe-view-manager-header {
   background-color: #f0eeee;
   border-bottom: 1px solid #afafb6;
+  -webkit-flex-shrink: 0;
   flex-shrink: 0;
   width: 100%;
   -webkit-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;
 }
@@ -1138,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;
@@ -1333,6 +1364,7 @@
 }
 .openerp .oe-search-options .oe-group-selector {
   margin: 3px 25px;
+  min-width: -webkit-calc(100% - 40px);
   min-width: calc(100% - 40px);
   max-width: 250px;
   width: auto;
@@ -1340,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;
 }
@@ -1375,23 +1411,29 @@
 }
 .openerp .oe-search-options .searchview_extended_prop_field {
   display: inline;
+  width: -webkic-calc(100% - 20px);
   width: calc(100% - 20px);
 }
 .openerp .oe-search-options .searchview_extended_prop_op {
   margin: 3px 0;
+  width: -webkit-calc(100% - 20px);
   width: calc(100% - 20px);
 }
 .openerp .oe-search-options .searchview_extended_delete_prop {
   float: right;
   display: inline;
+  cursor: pointer;
 }
 .openerp .oe-search-options .searchview_extended_prop_value {
+  width: -webkit-calc(100% - 20px);
   width: calc(100% - 20px);
 }
 .openerp .oe-search-options .searchview_extended_prop_value > select, .openerp .oe-search-options .searchview_extended_prop_value > input {
+  width: -webkit-calc(100% - 20px);
   width: calc(100% - 20px);
 }
 .openerp .oe-search-options .searchview_extended_prop_value .oe_datepicker_main {
+  width: -webkit-calc(100% - 20px);
   width: calc(100% - 20px);
 }
 .openerp .oe-search-options .searchview_extended_prop_value .oe_datepicker_master {
@@ -1417,6 +1459,20 @@
   padding-right: 10px;
   margin-bottom: 5px;
 }
+.openerp .oe-search-options .dropdown-menu li.oe-filter-condition .o-or-filter {
+  display: none;
+}
+.openerp .oe-search-options .dropdown-menu li.oe-filter-condition + li.oe-filter-condition {
+  margin-top: 10px;
+}
+.openerp .oe-search-options .dropdown-menu li.oe-filter-condition + li.oe-filter-condition .o-or-filter {
+  display: block;
+}
+.openerp .oe-search-options .dropdown-menu .o-or-filter {
+  position: absolute;
+  left: 5px;
+  top: 5px;
+}
 .openerp .oe-search-options a {
   display: inline-block;
 }
@@ -1647,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;
@@ -1970,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;
@@ -2708,6 +2768,7 @@
     top: 0px;
   }
 }
+
 .kitten-mode-activated {
   background-size: cover;
   background-attachment: fixed;
@@ -3044,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;
@@ -3056,16 +3130,14 @@ body.oe_single_form .oe_single_form_container {
 .modal .oe_act_window.modal-body {
   padding: 0;
 }
-.modal .oe-modal-header {
-  background-color: #f0eeee;
-}
 .modal .oe-view-manager-content > div {
   position: static !important;
 }
 
 @media (min-width: 768px) {
   .modal .modal-body {
-    max-height: calc(100vh - 200px);
+    max-height: -webkit-calc(100vh - 170px);
+    max-height: calc(100vh - 170px);
   }
 }
 .ui-datepicker {