[MERGE] from master
[odoo/odoo.git] / addons / web / static / src / css / base.sass
index 1047548..fa37c1c 100644 (file)
@@ -198,10 +198,16 @@ $sheet-padding: 16px
     font-size: 13px
     background: white
     &.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_webclient_container
+            height: 95%
+            height: -webkit-calc(100% - 52px)
             height: calc(100% - 52px)
     // }}}
     //Placeholder style{{{
@@ -455,17 +461,16 @@ $sheet-padding: 16px
             font-weight: bold
             &:hover
                 text-decoration: underline
-    .oe_webclient
-        .oe_star_on, .oe_star_off
-            color: #cccccc
-            text-shadow: 0 0 2px black
-            vertical-align: top
-            position: relative
-            top: -8px
-        .oe_star_on:hover, .oe_star_off:hover
-            text-decoration: none
-        .oe_star_on
-            color: gold
+    .oe_star_on, .oe_star_off
+        color: #cccccc
+        text-shadow: 0 0 2px black
+        vertical-align: top
+        position: relative
+        top: -8px
+    .oe_star_on:hover, .oe_star_off:hover
+        text-decoration: none
+    .oe_star_on
+        color: gold
     p.oe_grey
         max-width: 650px
     .oe_grey
@@ -689,12 +694,6 @@ $sheet-padding: 16px
         .oe_database_manager_menu
             color: #000
     // }}}
-    // WebClient {{{
-    .oe_webclient
-        width: 100%
-        height: 100%
-        border-spacing: 0px
-    // }}}
     // WebClient.fullscreen {{{
     .oe_content_full_screen
         .oe_application
@@ -705,16 +704,30 @@ $sheet-padding: 16px
     // }}}
     // Webclient.leftbar {{{
     .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%
         background: #f0eeee
         border-right: 1px solid $tag-border
         position: relative
+        display: inline-block\9
+        vertical-align: top\9
         a.oe_logo
             text-align: center
+            -webkit-flex-shrink: 0
+            flex-shrink: 0
             img
                 margin: 14px 0
                 border: 0
@@ -732,14 +745,16 @@ $sheet-padding: 16px
             &:hover .oe_logo_edit_admin
                 display: block
         .oe_secondary_menus_container
+            -webkit-flex-grow: 1
             flex-grow: 1
             overflow-y: auto
         .oe_footer
             background: #f0eeee
             text-align: center
+            -webkit-flex-shrink: 0
+            flex-shrink: 0
             a
                 font-weight: bold
-                color: black
                 span
                     color: #a24689
     // }}}
@@ -845,31 +860,67 @@ $sheet-padding: 16px
         text-decoration: underline
     .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)
+        .oe_application
+            width: 100%
     // }}}
     // ViewManager common {{{
     .oe-view-manager
         width: 100%
         height: 100%
+        display: -webkit-flex
         display: flex
+        -webkit-flex-direction: column
         flex-direction: column
         .oe-view-manager-content
             overflow: auto
+            -webkit-flex-grow: 1
+            flex-grow: 1
+            position: relative
+            a
+                color: $link-color
+            > div
+                position: absolute
+                position: static\9
+                top: 0
+                bottom: 0
+                right: 0
+                left: 0
+                display: none
+            .oe-view-manager-content
+                > div
+                    position: relative
+                    display: block
         .oe-view-manager-debug
             margin-right: 5px
     .oe-view-manager-header
         background-color: rgb(240, 238, 238)
         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
+        .oe-button-column
+            height: 30px
         .dropdown-menu
             li
                 position: relative
                 a
                     padding: 3px 25px
+            .oe_searchview_custom_public
+                a:after
+                    font-family: FontAwesome
+                    content: "\f0c0"
+                    color: #666
+                    margin-left: 3px
         .selected
             display: block
             a
@@ -945,6 +996,13 @@ $sheet-padding: 16px
                         width: 100%
         .oe_form_buttons
             padding: 0
+        .oe_form_buttons_view
+            > button
+                float: left
+                &:last-child
+                    float: right
+                    margin-left: 4px
+
         .oe-pager-buttons
             min-height: 30px
     .oe_view_manager_inline, .oe_view_manager_inlineview
@@ -953,8 +1011,11 @@ $sheet-padding: 16px
 
         // }}}
     // FormPopup {{{
+    .o-modal-header
+        > div
+            margin-left: 45%
     .oe_popup_form 
-        display: table
+        display: none
         .oe_formview .oe_form_pager
             display: none !important
         // Customize label weight for popup wizard appear from another wizard according bootstrap3
@@ -963,9 +1024,6 @@ $sheet-padding: 16px
         // End of customize
     .oe_popup_list_pager
         float: right
-    .oe_popup_search
-        width: 50%
-        float: right
     // }}}
     // SearchView {{{
     .oe_searchview
@@ -1106,12 +1164,15 @@ $sheet-padding: 16px
             padding-right: 10px
         .oe-group-selector
             margin: 3px 25px
+            min-width: -webkit-calc(100% - 40px)
             min-width: calc(100% - 40px)
             max-width: 250px
             width: auto
         .divider
             display: none
         .filters-menu
+            overflow: auto
+            overflow-x: hidden
             .divider
                 display: list-item
         .closed-menu
@@ -1142,26 +1203,32 @@ $sheet-padding: 16px
                     margin-left: 0
         .searchview_extended_prop_field
             display: inline
+            width: -webkic-calc(100% - 20px)
             width: calc(100% - 20px)
         
         .searchview_extended_prop_op
             margin: 3px 0
+            width: -webkit-calc(100% - 20px)
             width: calc(100% - 20px)
         .searchview_extended_delete_prop
             float: right
             display: inline
+            cursor: pointer
         .searchview_extended_prop_value
+            width: -webkit-calc(100% - 20px)
             width: calc(100% - 20px)
             > select, > input
+                width: -webkit-calc(100% - 20px)
                 width: calc(100% - 20px)
             .oe_datepicker_main
+                width: -webkit-calc(100% - 20px)
                 width: calc(100% - 20px)
             .oe_datepicker_master
                 width: 100%
             .fa-calendar
                 margin-left: -21px
                 cursor: pointer
-        span.fa-trash-o
+        span.remove-filter
             position: absolute
             top: 6px
             right: 10px
@@ -1175,6 +1242,16 @@ $sheet-padding: 16px
                 padding-left: 25px
                 padding-right: 10px
                 margin-bottom: 5px
+                .o-or-filter
+                    display: none
+            li.oe-filter-condition + li.oe-filter-condition
+                margin-top: 10px
+                .o-or-filter
+                    display: block
+            .o-or-filter
+                position: absolute
+                left: 5px
+                top: 5px
         a
             display: inline-block
 
@@ -1349,7 +1426,7 @@ $sheet-padding: 16px
             td.oe_form_group_cell_label
                 border-right: none
             .oe_subtotal_footer_separator
-                width: 108px
+                min-width: 108px
                 border-top: 1px solid #cacaca
                 margin-top: 4px
                 padding-top: 4px
@@ -1616,6 +1693,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
@@ -2479,13 +2559,31 @@ body.oe_single_form
         height: 18px
         font-size: 20px
     .modal-body
-        overflow-x: auto
+        overflow: auto
+        padding: 0
+        .oe_application
+            width: 100%
+        .oe_popup_list
+            display: none
+            min-height: 150px
+        .oe-view-manager
+            min-height: 150px
+        .oe_form_sheetbg
+            .oe_form_sheet
+                padding: 0
     .modal-footer
         text-align: left
     .oe_button
         margin: 0 4px 0 0
     .oe_act_window.modal-body
         padding: 0
+    .oe-view-manager-content > div
+        position: static !important
+
+@media (min-width: 768px)
+    .modal .modal-body
+        max-height: -webkit-calc(100vh - 170px)
+        max-height: calc(100vh - 170px)
 
 .ui-datepicker
     z-index: 1500 !important
@@ -2529,11 +2627,13 @@ div.tour-backdrop
 body
     overflow: hidden
 
-// hack to make IE11 work
 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) 
-    .oe_secondary_menus_container 
-        position: static !important
-
+    .oe-view-manager-content
+        > div
+            position: absolute !important
+        .oe-view-manager-content
+            > div
+                position: relative !important
 
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"