From 2e3e44255ebb4e7530c48b35df62a12c99b4323c Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 20 Feb 2014 15:52:00 +0530
Subject: [FIX] Editor bar is showing border.

bzr revid: psa@tinyerp.com-20140220102200-2r2urlrrkngv20at
---
 addons/website/static/src/css/editor.css  | 1 +
 addons/website/static/src/css/editor.sass | 1 +
 2 files changed, 2 insertions(+)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 4fb4496e692..df2188e794d 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -26,6 +26,7 @@
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
+  -ms-filter: "alpha(opacity=50)";
 }
 
 /* ---- OpenERP Style ---- {{{ */
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 2e6513f7c1d..49b71ffefdf 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -23,6 +23,7 @@
     background: transparent
     border: none
     +box-shadow(none)
+    -ms-filter: "alpha(opacity=50)"
 
 // }}}
  
-- 
cgit v1.2.3


From cfeac71d6a004c73c7afb0bd3d5d23410e541549 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 26 Feb 2014 18:55:58 +0100
Subject: [FIX] website: editor: pointer-events:none for ie doesn't work
 (because ie). Change snippet overlay to fix this ie bug

bzr revid: chm@openerp.com-20140226175558-2gyix2zgdawf87yz
---
 addons/website/static/src/css/snippets.css  | 78 ++++++++++++++++-------------
 addons/website/static/src/css/snippets.sass | 64 +++++++++++------------
 2 files changed, 77 insertions(+), 65 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 18f3852db2c..a19baa33fd6 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -80,10 +80,8 @@
   -moz-user-select: none;
   user-select: none;
   cursor: move;
-  pointer-events: none;
 }
 .oe_snippet .oe_snippet_thumbnail {
-  pointer-events: auto;
   text-align: center;
   height: 100%;
   background: transparent;
@@ -200,6 +198,7 @@
 
 .oe_overlay {
   display: none;
+  height: 0;
   position: absolute;
   background: transparent;
   -webkit-border-radius: 3px;
@@ -214,20 +213,12 @@
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
-  pointer-events: none;
 }
 .oe_overlay.oe_active {
   display: block;
-  border-style: dashed;
-  border-width: 1px;
-  -webkit-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset;
-  -moz-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset;
-  box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset;
-  border-color: rgba(0, 0, 0, 0.5);
 }
 .oe_overlay .oe_handle {
   display: block !important;
-  pointer-events: auto;
   position: absolute;
   top: 50%;
   left: 50%;
@@ -238,7 +229,18 @@
   height: 16px;
   margin: -2px;
 }
+.oe_overlay .oe_handle > div {
+  z-index: 1;
+  position: absolute;
+  border-style: dashed;
+  border-width: 1px;
+  border-color: #666666;
+  -webkit-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.5), 0px 0px 0px 1px rgba(255, 255, 255, 0.5) inset;
+  -moz-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.5), 0px 0px 0px 1px rgba(255, 255, 255, 0.5) inset;
+  box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.5), 0px 0px 0px 1px rgba(255, 255, 255, 0.5) inset;
+}
 .oe_overlay .oe_handle.e:before, .oe_overlay .oe_handle.w:before, .oe_overlay .oe_handle.s:before, .oe_overlay .oe_handle.n:before, .oe_overlay .oe_handle.size .oe_handle_button {
+  z-index: 2;
   position: relative;
   top: 50%;
   left: 50%;
@@ -270,56 +272,70 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
+.oe_overlay .oe_handle.e, .oe_overlay .oe_handle.w {
+  top: 4px;
+  height: 100%;
+}
 .oe_overlay .oe_handle.e:before, .oe_overlay .oe_handle.w:before {
   content: "\f0d9-\f0da";
   line-height: 16px;
 }
+.oe_overlay .oe_handle.e > div, .oe_overlay .oe_handle.w > div {
+  width: 0;
+  height: 100%;
+  top: 2px;
+  left: 8px;
+}
 .oe_overlay .oe_handle.e {
   left: auto;
-  top: 2px;
-  height: 100%;
   right: -6px;
   cursor: w-resize;
 }
 .oe_overlay .oe_handle.w {
-  top: 2px;
-  height: 100%;
   left: -6px;
   cursor: e-resize;
 }
+.oe_overlay .oe_handle.s, .oe_overlay .oe_handle.n {
+  left: 2px;
+  width: 100%;
+}
 .oe_overlay .oe_handle.s:before, .oe_overlay .oe_handle.n:before {
-  z-index: 0;
   content: "\f07d";
   text-align: center;
   padding: 1px;
 }
+.oe_overlay .oe_handle.s > div, .oe_overlay .oe_handle.n > div {
+  width: 100%;
+  height: 0;
+  top: 7px;
+  left: 1px;
+}
 .oe_overlay .oe_handle.s {
   top: auto;
-  left: 2px;
-  width: 100%;
-  bottom: -6px;
   cursor: n-resize;
 }
 .oe_overlay .oe_handle.n {
-  left: 2px;
-  width: 100%;
-  top: -6px;
   cursor: s-resize;
 }
+.oe_overlay .oe_handle.n > div {
+  top: 5px;
+}
 .oe_overlay .oe_handle.size {
+  z-index: 3;
   top: auto;
-  left: 2px;
-  width: 100%;
+  left: 50%;
   bottom: -6px;
 }
 .oe_overlay .oe_handle.size .oe_handle_button {
-  z-index: 1;
+  z-index: 3;
   content: "Resize";
   width: 64px;
   text-align: center;
   margin-left: -32px;
   margin-top: -10px;
   cursor: row-resize;
+  left: 0px;
+  top: 9px;
 }
 .oe_overlay .oe_handle.size .oe_handle_button:hover {
   background: rgba(30, 30, 30, 0.8);
@@ -328,25 +344,20 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
-.oe_overlay .oe_handle.size div {
-  border-style: dashed;
-  border-width: 0 0 1px 0;
-  border-color: rgba(0, 0, 0, 0.5);
-  position: relative;
-  top: 8px;
-}
 .oe_overlay .icon.btn {
   display: inline-block;
 }
 .oe_overlay .oe_overlay_options {
   position: absolute;
-  width: 100%;
+  left: 50% !important;
   text-align: center;
   top: -11px;
   z-index: 1002;
 }
+.oe_overlay .oe_overlay_options > .btn-group {
+  left: -50%;
+}
 .oe_overlay .oe_overlay_options .btn, .oe_overlay .oe_overlay_options a {
-  pointer-events: auto;
   cursor: pointer;
 }
 .oe_overlay .oe_overlay_options .dropdown {
@@ -505,7 +516,6 @@
   box-shadow: 0px 3px 17px rgba(99, 53, 150, 0.59);
 }
 .oe_snippet_editor .oe_snippet > * {
-  pointer-events: none;
   margin-top: 16px;
   line-height: 1em;
   zoom: 0.6;
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index d185ddd2932..afdb261a2a5 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -64,9 +64,7 @@
     overflow: hidden
     +user-select(none)
     cursor: move
-    pointer-events: none
     .oe_snippet_thumbnail
-        pointer-events: auto
         text-align: center
         height: 100%
         background: transparent
@@ -150,22 +148,17 @@
 
 .oe_overlay
     display: none
+    height: 0
     position: absolute
     background: transparent
     //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.02) ,rgba(255,255,255,.02) 35px, rgba(0,0,0,.02) 35px, rgba(0,0,0,.02) 75px))
     +border-radius(3px)
     @include transition(opacity 100ms linear)
     +box-sizing(border-box)
-    pointer-events: none
     &.oe_active
         display: block
-        border-style: dashed
-        border-width: 1px
-        +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset)
-        border-color: rgba(0, 0, 0, 0.5)
     .oe_handle
         display: block !important
-        pointer-events: auto
         position: absolute
         top: 50%
         left: 50%
@@ -173,7 +166,15 @@
         width: 16px
         height: 16px
         margin: -2px
+        > div
+            z-index: 1
+            position: absolute
+            border-style: dashed
+            border-width: 1px
+            border-color: #666666
+            +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.5), 0px 0px 0px 1px rgba(255,255,255,0.5) inset)
         &.e:before, &.w:before, &.s:before, &.n:before, &.size .oe_handle_button
+            z-index: 2
             position: relative
             top: 50%
             left: 50%
@@ -196,72 +197,74 @@
                 color: #fff
                 +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
         &.e, &.w
+            top: 4px
+            height: 100%
             &:before
                 content: "\f0d9-\f0da"
                 line-height: 16px
+            > div
+                width: 0
+                height: 100%
+                top: 2px
+                left: 8px
         &.e
             left: auto
-            top: 2px
-            height: 100%
             right: -6px
             cursor: w-resize
         &.w
-            top: 2px
-            height: 100%
             left: -6px
             cursor: e-resize
         &.s, &.n
+            left: 2px
+            width: 100%
             &:before
-                z-index: 0
                 content: "\f07d"
                 text-align: center
                 padding: 1px
+            > div
+                width: 100%
+                height: 0
+                top: 7px
+                left: 1px
         &.s
             top: auto
-            left: 2px
-            width: 100%
-            bottom: -6px
             cursor: n-resize
         &.n
-            left: 2px
-            width: 100%
-            top: -6px
             cursor: s-resize
+            > div
+                top: 5px
         &.size
+            z-index: 3
             top: auto
-            left: 2px
-            width: 100%
+            left: 50%
             bottom: -6px
             .oe_handle_button
-                z-index: 1
+                z-index: 3
                 content: "Resize"
                 width: 64px
                 text-align: center
                 margin-left: -32px
                 margin-top: -10px
                 cursor: row-resize
+                left: 0px
+                top: 9px
                 &:hover
                     background: rgba(30, 30, 30, .8)
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
-            div
-                border-style: dashed
-                border-width: 0 0 1px 0
-                border-color: rgba(0, 0, 0, 0.5)
-                position: relative
-                top: 8px
 
     .icon.btn
         display: inline-block
 
     .oe_overlay_options
         position: absolute
-        width: 100%
+        left: 50% !important
         text-align: center
         top: -11px
         z-index: 1002
+        > .btn-group
+            left: -50%
         .btn, a
-            pointer-events: auto
             cursor: pointer
         .dropdown
             display: inline-block
@@ -392,7 +395,6 @@
             border: 2px solid rgb(151, 137, 255)
             box-shadow: 0px 3px 17px rgba(99, 53, 150, 0.59)
         & > *
-            pointer-events: none
             margin-top: 16px
             line-height: 1em
             zoom: 0.6
-- 
cgit v1.2.3


From ce1ff0a85487bca3ef072abe6ba0c777335d3855 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 28 Feb 2014 14:17:38 +0100
Subject: [FIX] website snippet: Fix parallax with retro-compatibility; Crappy
 fix for carousel because bootstrap active cycling when user click on a bullet
 and don't stop when user edit a snippet inside a slider.

bzr revid: chm@openerp.com-20140228131738-il41640r8x9zesll
---
 addons/website/static/src/css/website.css  | 15 ++++-----------
 addons/website/static/src/css/website.sass | 21 ++++++++-------------
 2 files changed, 12 insertions(+), 24 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index db0aff3b01a..81b40ce7aca 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -394,22 +394,15 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .parallax {
-  position: relative;
   background-size: cover;
+}
+.parallax > div {
+  position: relative;
   display: table;
   width: 100%;
-  min-height: 100px;
-}
-.parallax.oe_small {
   min-height: 200px;
 }
-.parallax.oe_medium {
-  min-height: 300px;
-}
-.parallax.oe_big {
-  min-height: 450px;
-}
-.parallax > div {
+.parallax > div > div {
   display: table-cell;
   vertical-align: middle;
   padding: 32px 0;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 907b0615c0e..a9ae82cee3a 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -324,21 +324,16 @@ div.carousel[data-snippet-id="slider"]
             background-color: grey
 
 .parallax
-    position: relative
     background-size: cover
-    display: table
-    width: 100%
-    min-height: 100px
-    &.oe_small
-        min-height: 200px
-    &.oe_medium
-        min-height: 300px
-    &.oe_big
-        min-height: 450px
     > div
-        display: table-cell
-        vertical-align: middle
-        padding: 32px 0
+        position: relative
+        display: table
+        width: 100%
+        min-height: 200px
+        > div
+            display: table-cell
+            vertical-align: middle
+            padding: 32px 0
 
 /* Background */
 
-- 
cgit v1.2.3


From 68749a06831a3f3e22c75b8647ecfdafe99429c0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 15:20:17 +0100
Subject: [IMP] website: snippet: remove data-snippet-id and add auto resize on
 resising option

bzr revid: chm@openerp.com-20140303142017-jcb3401wpiuvbc1n
---
 addons/website/static/src/css/snippets.css  | 5 -----
 addons/website/static/src/css/snippets.sass | 4 ----
 addons/website/static/src/css/website.css   | 9 +++++----
 addons/website/static/src/css/website.sass  | 7 ++++---
 4 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index fe9c18c0081..3f5373e57e4 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -608,8 +608,3 @@
   height: 16px;
   display: inline-block;
 }
-
-[data-snippet-id] {
-  min-height: 10px;
-  min-width: 10px;
-}
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index a06bba01dba..f9432b3749d 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -483,10 +483,6 @@
             height: 16px
             display: inline-block
 
-[data-snippet-id] 
-    min-height: 10px
-    min-width: 10px
-
 
 
 
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index e47b7a41baa..78262bc7dd4 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -280,12 +280,13 @@ ul.nav-stacked > li > a {
   background-size: 100%;
 }
 
-[data-snippet-id], .colmd, .hr, .blockquote {
+section, .carousel, .parallax, .row, .hr, .blockquote {
+  min-height: 30px;
   overflow: hidden;
 }
 
 @media (max-width: 400px) {
-  [data-snippet-id]:not([data-snippet-id="carousel"]) {
+  section, .parallax, .row, .hr, .blockquote {
     height: auto !important;
   }
 }
@@ -380,10 +381,10 @@ ul.nav-stacked > li > a {
 }
 
 /* Parallax Theme */
-div.carousel[data-snippet-id="slider"] .carousel-indicators li {
+div.carousel .carousel-indicators li {
   border: 1px solid grey;
 }
-div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
+div.carousel .carousel-indicators .active {
   background-color: grey;
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 3cdfe37a896..680f26cef07 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -230,11 +230,12 @@ ul.nav-stacked > li > a
 .oe_img_bg
     background-size: 100%
 
-[data-snippet-id],.colmd,.hr,.blockquote
+section, .carousel, .parallax, .row, .hr, .blockquote
+    min-height: 30px
     overflow: hidden
 
 @media (max-width: 400px)
-    [data-snippet-id]:not([data-snippet-id="carousel"])
+    section, .parallax, .row, .hr, .blockquote
         height: auto !important
 
 .carousel-inner
@@ -312,7 +313,7 @@ ul.nav-stacked > li > a
 
 /* Parallax Theme */
 
-div.carousel[data-snippet-id="slider"]
+div.carousel
     .carousel-indicators
         li
             border: 1px solid grey
-- 
cgit v1.2.3


From e78a3b18cc6c049a712d594ab70287c486447f0a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Mar 2014 12:07:16 +0100
Subject: [ADD] tentative removal of attachments

Attachments ought be removed only if they are not used in an existing page/web
view.

Theoretically this could be set directly in unlink(), but:
* that would make a nice error message significantly harder
* the expenses of performing a text search in all view archs would be a bit expensive

Notes:
* the views set could be reduced to only "web" views
* the search is likely sensible to false negatives e.g. different order of
  query parameters. It *will* remove images still being used.

bzr revid: xmo@openerp.com-20140304110716-u14w6uo8fbkfa42i
---
 addons/website/static/src/css/editor.css  | 20 ++++++++++++++++++++
 addons/website/static/src/css/editor.sass | 22 ++++++++++++++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index df2188e794d..da0fad43caf 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -251,6 +251,26 @@ ul.oe_menu_editor .disclose {
 .existing-attachments .pager .disabled {
   display: none;
 }
+.existing-attachments .existing-attachment-cell {
+  position: relative;
+}
+.existing-attachments .existing-attachment-cell .img {
+  border: 1px solid #848490;
+}
+.existing-attachments .existing-attachment-cell .existing-attachment-remove {
+  position: absolute;
+  top: 0;
+  left: 15px;
+  cursor: pointer;
+  background: white;
+  padding: 2px;
+  border: 1px solid #848490;
+  border-top: none;
+  border-left: none;
+  -moz-border-radius-bottomright: 8px;
+  -webkit-border-bottom-right-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
 
 .cke_widget_wrapper {
   position: static !important;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 49b71ffefdf..4571dcd257e 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -211,9 +211,27 @@ ul.oe_menu_editor
         .font-icons-selected
             background-color: #ddd
 
+$attachment-border-color: #848490
+.existing-attachments
+    .pager .disabled
+        display: none
 
-.existing-attachments .pager .disabled
-    display: none
+    .existing-attachment-cell
+        position: relative
+        .img
+            border: 1px solid $attachment-border-color
+        .existing-attachment-remove
+            position: absolute
+            top: 0
+            left: 15px // padding-left on col-*
+
+            cursor: pointer
+            background: white
+            padding: 2px
+            border: 1px solid $attachment-border-color
+            border-top: none
+            border-left: none
+            +border-bottom-right-radius(8px)
 
 // wrapper positioned relatively for drag&drop widget which is disabled below.
 // Breaks completely horribly crazy products listing page, so take it out.
-- 
cgit v1.2.3


From 7cf77276fbad07f9757255bf08adc927f80e0036 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 5 Mar 2014 18:54:11 +0100
Subject: [IMP] website snippet: add Configurable follow snippet

bzr revid: chm@openerp.com-20140305175411-in3oodk778dxvu0k
---
 addons/website/static/src/css/snippets.css  | 2 +-
 addons/website/static/src/css/snippets.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 3f5373e57e4..4baa2b06f2d 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -342,7 +342,7 @@
   position: absolute;
   width: 100%;
   text-align: center;
-  top: -11px;
+  top: -20px;
   z-index: 1002;
 }
 .oe_overlay .oe_overlay_options .btn, .oe_overlay .oe_overlay_options a {
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index f9432b3749d..1be99e27f19 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -258,7 +258,7 @@
         position: absolute
         width: 100%
         text-align: center
-        top: -11px
+        top: -20px
         z-index: 1002
         .btn, a
             pointer-events: auto
-- 
cgit v1.2.3


From 34f05212b78d94c7ac5c8ee09be4ddd9b84fe968 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 17:24:20 +0100
Subject: [FIX] website: snippet & bootstrap for event view

bzr revid: chm@openerp.com-20140306162420-rvrjia8cx6y8yxd1
---
 addons/website/static/src/css/website.css  | 1 +
 addons/website/static/src/css/website.sass | 1 +
 2 files changed, 2 insertions(+)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 78262bc7dd4..fb6dd4552b1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -119,6 +119,7 @@ header a.navbar-brand img {
 .container .container {
   padding-left: 0;
   padding-right: 0;
+  width: auto;
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 680f26cef07..787dca1257f 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
     .container
         padding-left: 0
         padding-right: 0
+        width: auto
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 
-- 
cgit v1.2.3


From 4d125a3b52f6141736a7c125482f6e8dff3809e6 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 10:34:40 +0100
Subject: [IMP] website: simplify code share button; wip: fix overlay

bzr revid: chm@openerp.com-20140312093440-4uzrpkguzu0fc5p5
---
 addons/website/static/src/css/snippets.css  | 3 +++
 addons/website/static/src/css/snippets.sass | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 1416f2f899f..48400b88d45 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -344,6 +344,9 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
+.oe_overlay .oe_handle.readonly {
+  content: "";
+}
 .oe_overlay .icon.btn {
   display: inline-block;
 }
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index 8d337aadf3c..0c4abe362e2 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -252,6 +252,8 @@
                     background: rgba(30, 30, 30, .8)
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
+        &.readonly
+            content: ""
 
     .icon.btn
         display: inline-block
-- 
cgit v1.2.3


From d6fc0c259e510a1608caca785f91cdb3bb3fdb76 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 14:09:39 +0100
Subject: [FIX] website: snippet overlay position

bzr revid: chm@openerp.com-20140312130939-6k15igo39ybuu81s
---
 addons/website/static/src/css/snippets.css  | 5 ++++-
 addons/website/static/src/css/snippets.sass | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 48400b88d45..4121b70ef2e 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -345,7 +345,10 @@
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
 .oe_overlay .oe_handle.readonly {
-  content: "";
+  cursor: auto !important;
+}
+.oe_overlay .oe_handle.readonly:before, .oe_overlay .oe_handle.readonly.size {
+  display: none !important;
 }
 .oe_overlay .icon.btn {
   display: inline-block;
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index 0c4abe362e2..d7442a5b0f7 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -253,7 +253,9 @@
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
         &.readonly
-            content: ""
+            cursor: auto !important
+            &:before, &.size
+                display: none !important
 
     .icon.btn
         display: inline-block
-- 
cgit v1.2.3


From 4093259ec2f6a527b6beb4c784903cd4ff415d18 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 18:55:19 +0100
Subject: [WIP] website: fix css layout for themes

bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
---
 .../static/src/css/bootswatch/amelia.fix.css        | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 addons/website/static/src/css/bootswatch/amelia.fix.css

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
new file mode 100644
index 00000000000..f724abcbfc9
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -0,0 +1,21 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #ad1d28;
+}
+.oe_product section {
+    background: rgba(16, 138, 147, 0.75) !important;
+}
+.oe_product section .oe_subdescription {
+    color: #DFD6F5;
+}
+ul.wizard li {
+    background: #debb27 !important;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #debb27 !important;
+}
+ul.wizard .text-primary {
+    color: #ad1d28 !important;
+}
+ul.wizard .text-success {
+    color: #ffffff !important;
+}
-- 
cgit v1.2.3


From e9fc839785259ca56542d112a6c1f032eab8e2b8 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 11:21:40 +0100
Subject: [FIX] website: css themes

bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
---
 addons/website/static/src/css/bootswatch/amelia.fix.css   |  8 +++++++-
 addons/website/static/src/css/bootswatch/cosmo.fix.css    |  7 +++++++
 addons/website/static/src/css/bootswatch/cyborg.fix.css   | 12 ++++++++++++
 addons/website/static/src/css/bootswatch/flatly.fix.css   |  3 +++
 addons/website/static/src/css/bootswatch/journal.fix.css  |  6 ++++++
 addons/website/static/src/css/bootswatch/readable.fix.css |  3 +++
 addons/website/static/src/css/bootswatch/simplex.fix.css  |  3 +++
 addons/website/static/src/css/bootswatch/slate.fix.css    | 14 ++++++++++++++
 addons/website/static/src/css/bootswatch/yeti.fix.css     |  3 +++
 addons/website/static/src/css/website.css                 |  1 +
 addons/website/static/src/css/website.sass                |  1 +
 11 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 addons/website/static/src/css/bootswatch/cosmo.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/cyborg.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/flatly.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/journal.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/readable.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/simplex.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/slate.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/yeti.fix.css

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
index f724abcbfc9..38d71852a0a 100644
--- a/addons/website/static/src/css/bootswatch/amelia.fix.css
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -4,7 +4,7 @@
 .oe_product section {
     background: rgba(16, 138, 147, 0.75) !important;
 }
-.oe_product section .oe_subdescription {
+.oe_product section .text-info {
     color: #DFD6F5;
 }
 ul.wizard li {
@@ -19,3 +19,9 @@ ul.wizard .text-primary {
 ul.wizard .text-success {
     color: #ffffff !important;
 }
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before {
+    color: #79D5DB !important;
+}
+.input-group-addon .fa {
+    color: #444;
+}
diff --git a/addons/website/static/src/css/bootswatch/cosmo.fix.css b/addons/website/static/src/css/bootswatch/cosmo.fix.css
new file mode 100644
index 00000000000..5801cc0d7a4
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/cosmo.fix.css
@@ -0,0 +1,7 @@
+#website-top-navbar button.btn-primary {
+    color: #fff;
+    border: 2px solid #0061c2;
+}
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/cyborg.fix.css b/addons/website/static/src/css/bootswatch/cyborg.fix.css
new file mode 100644
index 00000000000..43c8e5770f9
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/cyborg.fix.css
@@ -0,0 +1,12 @@
+.oe_product section {
+    background: rgba(40, 40, 40, 0.85) !important;
+}
+.oe_product section .text-info {
+    color: #BA66E4;
+}
+ul.wizard li {
+    background: #222 !important;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #222 !important;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/flatly.fix.css b/addons/website/static/src/css/bootswatch/flatly.fix.css
new file mode 100644
index 00000000000..fe4a2e73ed1
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/flatly.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #2c3e50;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/journal.fix.css b/addons/website/static/src/css/bootswatch/journal.fix.css
new file mode 100644
index 00000000000..a7f93fa312f
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/journal.fix.css
@@ -0,0 +1,6 @@
+#website-top-navbar button.btn-primary {
+    border: 2px solid #e4332e;
+}
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/readable.fix.css b/addons/website/static/src/css/bootswatch/readable.fix.css
new file mode 100644
index 00000000000..8e22d318615
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/readable.fix.css
@@ -0,0 +1,3 @@
+.oe_product section .text-info {
+    color: #2A9CBE;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
new file mode 100644
index 00000000000..c87f0de237b
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/slate.fix.css b/addons/website/static/src/css/bootswatch/slate.fix.css
new file mode 100644
index 00000000000..a61f8d98338
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/slate.fix.css
@@ -0,0 +1,14 @@
+.oe_product section {
+    background: rgba(40, 40, 45, 0.80) !important;
+}
+ul.wizard li {
+    background-image: -webkit-linear-gradient(#8a9196,#7a8288 60%,#788084) !important;
+    background-image: linear-gradient(#8a9196,#7a8288 60%,#788084 ) !important;
+    color: #ccc;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #7C8386 !important;
+}
+ul.wizard li.text-primary {
+    color: #fff;
+}
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
new file mode 100644
index 00000000000..c87f0de237b
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 81b40ce7aca..6f69f554bd1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -120,6 +120,7 @@ header a.navbar-brand img {
 .container .container {
   padding-left: 0;
   padding-right: 0;
+  width: 100%;
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index a9ae82cee3a..200401023a6 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
     .container
         padding-left: 0
         padding-right: 0
+        width: 100%
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 
-- 
cgit v1.2.3


From 8b94f855b69628937b1a9d45e5d3cf17d48b41ae Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 14:46:42 +0100
Subject: [FIX] website theme css

bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
---
 .../website/static/src/css/bootswatch/cyborg.fix.css   | 18 ++++++++++++++++++
 .../website/static/src/css/bootswatch/simplex.fix.css  |  3 +++
 addons/website/static/src/css/bootswatch/slate.fix.css |  7 +++++++
 addons/website/static/src/css/bootswatch/yeti.fix.css  |  3 +++
 4 files changed, 31 insertions(+)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/bootswatch/cyborg.fix.css b/addons/website/static/src/css/bootswatch/cyborg.fix.css
index 43c8e5770f9..e93b2aa8ded 100644
--- a/addons/website/static/src/css/bootswatch/cyborg.fix.css
+++ b/addons/website/static/src/css/bootswatch/cyborg.fix.css
@@ -9,4 +9,22 @@ ul.wizard li {
 }
 ul.wizard .chevron:before {
     border-left: 10px solid #222 !important;
+}
+.popover, .modal-content {
+    border: 1px solid rgba(200,200,200,0.5);
+}
+.close {
+    color: #fff;
+}
+.popover.bottom .arrow:after {
+    border-bottom-color: #333;
+}
+.popover.top .arrow:after {
+    border-top-color: #333;
+}
+.popover.left .arrow:after {
+    border-left-color: #333;
+}
+.popover.right .arrow:after {
+    border-right-color: #333;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
index c87f0de237b..5d1df525449 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,3 +1,6 @@
 #website-top-navbar [data-action="cancel"] {
     color: #fff;
+}
+.fa {
+    font-family: FontAwesome !important;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/slate.fix.css b/addons/website/static/src/css/bootswatch/slate.fix.css
index a61f8d98338..c2e1a999b03 100644
--- a/addons/website/static/src/css/bootswatch/slate.fix.css
+++ b/addons/website/static/src/css/bootswatch/slate.fix.css
@@ -12,3 +12,10 @@ ul.wizard .chevron:before {
 ul.wizard li.text-primary {
     color: #fff;
 }
+.close {
+    color: #fff;
+}
+.popover  {
+    -webkit-box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+    box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+}
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
index c87f0de237b..a2835886465 100644
--- a/addons/website/static/src/css/bootswatch/yeti.fix.css
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -1,3 +1,6 @@
 #website-top-navbar [data-action="cancel"] {
     color: #fff;
+}
+.popover .close {
+    color: #fff;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 62f0b963afb10ad51c8959b1ef8996f7ffb57f18 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 15:19:10 +0100
Subject: [ADD] missing css file

bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
---
 addons/website/static/src/css/bootswatch/spacelab.fix.css | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 addons/website/static/src/css/bootswatch/spacelab.fix.css

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/bootswatch/spacelab.fix.css b/addons/website/static/src/css/bootswatch/spacelab.fix.css
new file mode 100644
index 00000000000..6d01e9a2485
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/spacelab.fix.css
@@ -0,0 +1,8 @@
+.carousel .carousel-caption.content,
+.carousel .carousel-caption.content h1,
+.carousel .carousel-caption.content h2,
+.carousel .carousel-caption.content h3,
+.carousel .carousel-caption.content h4,
+.carousel .carousel-caption.content h5 {
+    color: #ccc;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 264186541b44d3fe4ec15aa4bc155e24d3e56179 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 16:04:46 +0100
Subject: [IMP] website: remove css .fa and write important in font fa in web
 branch

bzr revid: chm@openerp.com-20140314150446-9g4n4ixws4cedfxp
---
 addons/website/static/src/css/bootswatch/simplex.fix.css | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
index 5d1df525449..c87f0de237b 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,6 +1,3 @@
 #website-top-navbar [data-action="cancel"] {
     color: #fff;
-}
-.fa {
-    font-family: FontAwesome !important;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From b220dc926ef6e317aca7899b15c8f1a2a40ed9bd Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 17:36:39 +0100
Subject: [FIX] website: can't see edit button because css with overflow hidden
 for all tag. Aplly css only on carousel, paralax and blockquote

bzr revid: chm@openerp.com-20140314163639-l086jn568rtti5mv
---
 addons/website/static/src/css/website.css  | 2 ++
 addons/website/static/src/css/website.sass | 1 +
 2 files changed, 3 insertions(+)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 310f6b8156e..a6e4c3eb916 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -283,6 +283,8 @@ ul.nav-stacked > li > a {
 
 section, .carousel, .parallax, .row, .hr, .blockquote {
   min-height: 30px;
+}
+.carousel, .parallax, .blockquote {
   overflow: hidden;
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 563dcae95ec..d6fbd0ac7bf 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -233,6 +233,7 @@ ul.nav-stacked > li > a
 
 section, .carousel, .parallax, .row, .hr, .blockquote
     min-height: 30px
+.carousel, .parallax, .blockquote
     overflow: hidden
 
 @media (max-width: 400px)
-- 
cgit v1.2.3


From 19aacaaea8f809ec39dcbc3e4a2e997e85c22d20 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 17 Mar 2014 12:49:56 +0100
Subject: [FIX] website: readability block with container css

bzr revid: chm@openerp.com-20140317114956-j5sqt6flie5fla31
---
 addons/website/static/src/css/website.css  | 2 +-
 addons/website/static/src/css/website.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index a6e4c3eb916..1f0242d93d1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -116,7 +116,7 @@ header a.navbar-brand img {
 }
 
 /* ----- BOOTSTRAP FIX ----- */
-.container .container {
+.container .container, .readable .container {
   padding-left: 0;
   padding-right: 0;
   width: auto;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index d6fbd0ac7bf..e08d5c1dbe3 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -85,7 +85,7 @@ header
 
 /* ----- BOOTSTRAP FIX ----- */
 
-.container
+.container, .readable
     .container
         padding-left: 0
         padding-right: 0
-- 
cgit v1.2.3


From d3c7750b96253e952f199abdbbb5eede67d3c873 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 13:40:56 +0100
Subject: [FIX] inject WORD JOINER inside p so they don't seemingly disappear
 after saving

bzr revid: xmo@openerp.com-20140317124056-kg2jngp2mg769v7m
---
 addons/website/static/src/css/website.css  | 6 +++++-
 addons/website/static/src/css/website.sass | 9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 1f0242d93d1..fd5492c9bc2 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -102,6 +102,10 @@ header a.navbar-brand img {
   max-height: 50px;
 }
 
+div:before, p:before {
+  content: "\2060";
+}
+
 /* ----- Snippets Styles ----- */
 .readable {
   font-size: 120%;
@@ -217,7 +221,6 @@ footer {
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal {
   overflow: hidden;
-  overflow-y: hidden;
 }
 
 ul.nav-stacked > li > a {
@@ -284,6 +287,7 @@ ul.nav-stacked > li > a {
 section, .carousel, .parallax, .row, .hr, .blockquote {
   min-height: 30px;
 }
+
 .carousel, .parallax, .blockquote {
   overflow: hidden;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index e08d5c1dbe3..44afd627214 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -68,6 +68,12 @@ header
         img
             max-height: 50px
 
+// add {WORD JOINER} (equivalent to deprecated ZERO WIDTH NO-BREAK SPACE) at
+// the beginning of paragraphs (and divs) so they don't "disappear" after
+// saving when used solely for spacing.
+div:before, p:before
+    content: '\2060'
+
 /* ----- Snippets Styles ----- */
 
 .readable
@@ -78,11 +84,9 @@ header
 
 /* ----- EDITOR ----- */
 
-
 .css_non_editable_mode_hidden
     display: none
 
-
 /* ----- BOOTSTRAP FIX ----- */
 
 .container, .readable
@@ -180,7 +184,6 @@ footer
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal
     overflow: hidden
-    overflow-y: hidden
 
 ul.nav-stacked > li > a
     padding: 2px 15px
-- 
cgit v1.2.3


From cd4f83122ac61d44eeb45840aa6a2ec251ed9033 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 14:51:44 +0100
Subject: [FIX] reduce span of paragraph spacer thing to not break layout

bzr revid: xmo@openerp.com-20140317135144-hvuxshfp4cjudnbh
---
 addons/website/static/src/css/website.css  | 2 +-
 addons/website/static/src/css/website.sass | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index fd5492c9bc2..dc0628ca3c5 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -102,7 +102,7 @@ header a.navbar-brand img {
   max-height: 50px;
 }
 
-div:before, p:before {
+#wrapwrap p:empty:after {
   content: "\2060";
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 44afd627214..a15953e0f2b 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -69,9 +69,9 @@ header
             max-height: 50px
 
 // add {WORD JOINER} (equivalent to deprecated ZERO WIDTH NO-BREAK SPACE) at
-// the beginning of paragraphs (and divs) so they don't "disappear" after
-// saving when used solely for spacing.
-div:before, p:before
+// the beginning of paragraphs so they don't "disappear" after saving when
+// used solely for spacing.
+#wrapwrap p:empty:after
     content: '\2060'
 
 /* ----- Snippets Styles ----- */
-- 
cgit v1.2.3


From 77622d3b240b86332216f3d6e51114c6b5c3e473 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 18 Mar 2014 10:23:41 +0100
Subject: [FIX] Fix css which make unusable the option dropdown for unpublished
 product. When an user was hover on a product not published and was trying to
 go in submenu, he had lost cursor, because he was changing div due to opacoty
 little than 1.

bzr revid: jke@openerp.com-20140318092341-ncgb173y0xfiaj87
---
 addons/website/static/src/css/website.css  | 2 +-
 addons/website/static/src/css/website.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 6f69f554bd1..5e198c4de38 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -243,7 +243,7 @@ ul.nav-stacked > li > a {
   display: none;
 }
 
-[data-publish='off'] {
+[data-publish='off'] > *:not(.css_options) {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
   opacity: 0.5;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 200401023a6..75d2afb0bd0 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -200,7 +200,7 @@ ul.nav-stacked > li > a
     .btn-success, .css_unpublish
         display: none
 
-[data-publish='off']
+[data-publish='off']>*:not(.css_options)
     +opacity(0.5)
 
 /* ---- END of PUBLISH ---- */
-- 
cgit v1.2.3


From f9579073fe29361e677615b59f0adcc9cef6be26 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 18 Mar 2014 12:14:42 +0100
Subject: [FIX] website: color of Edit Master link for themes. CSS less
 specific

bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
---
 addons/website/static/src/css/bootswatch/amelia.fix.css  | 2 +-
 addons/website/static/src/css/bootswatch/cosmo.fix.css   | 2 +-
 addons/website/static/src/css/bootswatch/flatly.fix.css  | 2 +-
 addons/website/static/src/css/bootswatch/journal.fix.css | 2 +-
 addons/website/static/src/css/bootswatch/simplex.fix.css | 2 +-
 addons/website/static/src/css/bootswatch/yeti.fix.css    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
index 38d71852a0a..2f16ea5465c 100644
--- a/addons/website/static/src/css/bootswatch/amelia.fix.css
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -1,4 +1,4 @@
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #ad1d28;
 }
 .oe_product section {
diff --git a/addons/website/static/src/css/bootswatch/cosmo.fix.css b/addons/website/static/src/css/bootswatch/cosmo.fix.css
index 5801cc0d7a4..907aa7bf757 100644
--- a/addons/website/static/src/css/bootswatch/cosmo.fix.css
+++ b/addons/website/static/src/css/bootswatch/cosmo.fix.css
@@ -2,6 +2,6 @@
     color: #fff;
     border: 2px solid #0061c2;
 }
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #fff;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/flatly.fix.css b/addons/website/static/src/css/bootswatch/flatly.fix.css
index fe4a2e73ed1..c2d9500f5da 100644
--- a/addons/website/static/src/css/bootswatch/flatly.fix.css
+++ b/addons/website/static/src/css/bootswatch/flatly.fix.css
@@ -1,3 +1,3 @@
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #2c3e50;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/journal.fix.css b/addons/website/static/src/css/bootswatch/journal.fix.css
index a7f93fa312f..e9f41a33e8f 100644
--- a/addons/website/static/src/css/bootswatch/journal.fix.css
+++ b/addons/website/static/src/css/bootswatch/journal.fix.css
@@ -1,6 +1,6 @@
 #website-top-navbar button.btn-primary {
     border: 2px solid #e4332e;
 }
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #fff;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
index c87f0de237b..56dbb1fdd5f 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,3 +1,3 @@
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #fff;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
index a2835886465..3fd285c826e 100644
--- a/addons/website/static/src/css/bootswatch/yeti.fix.css
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -1,4 +1,4 @@
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #fff;
 }
 .popover .close {
-- 
cgit v1.2.3


From 1395c9ee0e14ce2c35dbf6258678d3b032d52c73 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 18 Mar 2014 14:04:14 +0100
Subject: [IMP] website: snippet editor: change size automatic button into a
 cross between resize handler

bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
---
 addons/website/static/src/css/snippets.css  | 16 ++++++++++++----
 addons/website/static/src/css/snippets.sass | 14 ++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'addons/website/static/src/css')

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 4121b70ef2e..726855f311b 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -328,14 +328,10 @@
 }
 .oe_overlay .oe_handle.size .oe_handle_button {
   z-index: 3;
-  content: "Resize";
-  width: 64px;
   text-align: center;
   margin-left: -32px;
   margin-top: -10px;
-  cursor: row-resize;
   left: 0px;
-  top: 9px;
 }
 .oe_overlay .oe_handle.size .oe_handle_button:hover {
   background: rgba(30, 30, 30, 0.8);
@@ -344,6 +340,18 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
+.oe_overlay .oe_handle.size .size {
+  width: 64px;
+  cursor: row-resize;
+  top: 9px;
+}
+.oe_overlay .oe_handle.size .auto_size {
+  width: 20px;
+  padding: 0 5px;
+  top: 1px;
+  margin-left: 36px;
+  cursor: pointer;
+}
 .oe_overlay .oe_handle.readonly {
   cursor: auto !important;
 }
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index d7442a5b0f7..9b12e9df246 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -240,18 +240,24 @@
             bottom: -6px
             .oe_handle_button
                 z-index: 3
-                content: "Resize"
-                width: 64px
                 text-align: center
                 margin-left: -32px
                 margin-top: -10px
-                cursor: row-resize
                 left: 0px
-                top: 9px
                 &:hover
                     background: rgba(30, 30, 30, .8)
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
+            .size
+                width: 64px
+                cursor: row-resize
+                top: 9px
+            .auto_size
+                width: 20px
+                padding: 0 5px
+                top: 1px
+                margin-left: 36px
+                cursor: pointer
         &.readonly
             cursor: auto !important
             &:before, &.size
-- 
cgit v1.2.3