[MERGE] Merge trunk

bzr revid: rim@openerp.com-20140211133450-itj3p86ptmqtqrjt

addons/website/static/src/css/website.css

@@ -399,7 +399,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .oe_green {
-  background-color: #51d466;
+  background-color: #169c78;
   color: white;
 }
 .oe_green .text-muted {
@@ -407,7 +407,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .oe_blue_light {
-  background-color: #4791d2;
+  background-color: #41b6ab;
   color: white;
 }
 .oe_blue_light .text-muted {
@@ -420,7 +420,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .oe_orange {
-  background-color: #e67e22;
+  background-color: #f05442;
   color: white;
 }
 .oe_orange .text-muted {
@@ -436,7 +436,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .oe_red {
-  background-color: #f75353;
+  background-color: #9c1b31;
   color: white;
 }
 .oe_red .text-muted {

addons/website/static/src/css/website.sass

@@ -328,13 +328,13 @@ div.carousel[data-snippet-id="slider"]
     color: white
 
 .oe_green
-    background-color: #51d466
+    background-color: #169C78
     color: white
     .text-muted
         color: #ddd
 
 .oe_blue_light
-    background-color: #4791d2
+    background-color: #41b6ab
     color: white
     .text-muted
         color: #ddd
@@ -344,7 +344,7 @@ div.carousel[data-snippet-id="slider"]
     color: white
 
 .oe_orange
-    background-color: #e67e22
+    background-color: #f05442
     color: white
     .text-muted
         color: #ddd
@@ -356,7 +356,7 @@ div.carousel[data-snippet-id="slider"]
         color: #ddd
 
 .oe_red
-    background-color: #f75353
+    background-color: #9C1b31
     color: white
     .text-muted
         color: #ddd

addons/website/views/snippets.xml

@@ -907,7 +907,7 @@
                         <li data-class='oe_dark'><a>Darken</a></li>
                         <li data-class='oe_green'><a>Green</a></li>
                         <li data-class='oe_red'><a>Red</a></li>
-                        <li data-class='oe_blue_light'><a>Light Blue</a></li>
+                        <li data-class='oe_blue_light'><a>Turquoise</a></li>
                         <li data-class='oe_blue'><a>Dark Blue</a></li>
                         <li data-class='oe_orange'><a>Orange</a></li>
                         <li data-class='oe_purple'><a>Purple</a></li>