Merge branch 'master' into master-pos-new-payment-screen-fva

Conflicts:
	addons/point_of_sale/point_of_sale.py
	addons/point_of_sale/point_of_sale_view.xml

1 files changed, 96 insertions, 47 deletions

diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 9364511b2df..ba47a12c90f 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -192,9 +192,6 @@ footer
 .nav-hierarchy
     padding-left: 16px
 
-#themes-list .well
-    padding: 0 0 20px 0
-
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal
     overflow: hidden
@@ -288,6 +285,102 @@ ul.nav-stacked > li > a
 .hr
     padding: 4px 0
 
+/* gallery */
+
+.o_gallery
+    &.o_grid, &.o_masonry
+        &.o_spc-none
+            div.row
+                margin: 0
+            div.row > *
+                padding: 0
+        &.o_spc-small
+            div.row
+                margin: 5px 0
+            div.row > *
+                padding: 0 5px
+        &.o_spc-medium
+            div.row
+                margin: 10px 0
+            div.row > *
+                padding: 0 10px
+        &.o_spc-big
+            div.row
+                margin: 15px 0
+            div.row > *
+                padding: 0 15px
+        .img
+            width: 100%
+    &.o_grid
+        &.size-auto .row
+            height: auto
+        &.size-small .row
+            height: 100px
+        &.size-medium .row
+            height: 250px
+        &.size-big .row
+            height: 400px
+        &.size-small, &.size-medium, &.size-big
+            .img
+                height: 100%
+    &.o_nomode
+        &.o_spc-none
+            .img
+                padding: 0
+        &.o_spc-small
+            .img
+                padding: 5px
+        &.o_spc-medium
+            .img
+                padding: 10px
+        &.o_spc-big
+            .img
+                padding: 15px
+
+    &.o_slideshow .carousel ul.carousel-indicators li
+        border: 1px solid #aaa
+    .carousel-inner .item img
+        max-width: none
+
+.o_gallery.o_slideshow > .container
+    height: 100%
+
+.o_gallery.o_slideshow .carousel, .modal-body.o_slideshow .carousel
+    height: 100%
+    img
+        max-height: 100%
+        max-width: 100%
+        margin: auto
+        position: relative
+        top: 50%
+        -webkit-transform: translateY(-50%)
+        -ms-transform: translateY(-50%)
+        transform: translateY(-50%)
+    ul.carousel-indicators
+        display: block
+        height: auto
+        padding: 0
+        border-width: 0
+        position: absolute
+        bottom: 0
+        li
+            list-style-image: none
+            display: inline-block
+            width: 35px
+            height: 35px
+            margin: 0 0px 5px 5px
+            padding: 0
+            border: 1px solid #aaa
+            text-indent: initial
+            background-size: cover
+            opacity: 0.5
+            background-color: #000
+        li.active
+            opacity: 1
+    .carousel-control.left, .carousel-control.right
+        background-image: none
+        background-color: transparent
+
 /* Parallax Theme */
 
 div.carousel
@@ -317,50 +410,6 @@ div.carousel
             vertical-align: middle
             padding: 32px 0
 
-/* Background */
-
-.oe_dark
-    background: #eff8f8
-    background: rgba(200, 200, 200, 0.14)
-
-.oe_black
-    background-color: rgba(0, 0, 0, 0.9)
-    color: white
-
-.oe_green
-    background-color: #169C78
-    color: white
-    .text-muted
-        color: #ddd
-
-.oe_blue_light
-    background-color: #41b6ab
-    color: white
-    .text-muted
-        color: #ddd
-
-.oe_blue
-    background-color: #34495e
-    color: white
-
-.oe_orange
-    background-color: #f05442
-    color: white
-    .text-muted
-        color: #ddd
-
-.oe_purple
-    background-color: #b163a3
-    color: white
-    .text-muted
-        color: #ddd
-
-.oe_red
-    background-color: #9C1b31
-    color: white
-    .text-muted
-        color: #ddd
-
 /* Misc */
 
 .texttop