[MERGE] Sync with website-al

bzr revid: tde@openerp.com-20140115091759-fdupd1vral3z3ng8

2 files changed, 95 insertions, 221 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index a047753ebfc..65b322bd9e9 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 /*       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
  *
  * css for editor buttons, openerp widget included in the website and other
@@ -79,95 +78,6 @@
   margin-bottom: 0px !important;
 }
 
-.pt128 {
-  padding-top: 128px !important;
-}
-
-.pt92 {
-  padding-top: 92px !important;
-}
-
-.pt64 {
-  padding-top: 64px !important;
-}
-
-.pt48 {
-  padding-top: 48px !important;
-}
-
-.pt32 {
-  padding-top: 32px !important;
-}
-
-.pt16 {
-  padding-top: 16px !important;
-}
-
-.pt8 {
-  padding-top: 8px !important;
-}
-
-.pt4 {
-  padding-top: 4px !important;
-}
-
-.pt0 {
-  padding-top: 0px !important;
-}
-
-.pb128 {
-  padding-bottom: 128px !important;
-}
-
-.pb92 {
-  padding-bottom: 92px !important;
-}
-
-.pb64 {
-  padding-bottom: 64px !important;
-}
-
-.pb48 {
-  padding-bottom: 48px !important;
-}
-
-.pb32 {
-  padding-bottom: 32px !important;
-}
-
-.pb16 {
-  padding-bottom: 16px !important;
-}
-
-.pb8 {
-  padding-bottom: 8px !important;
-}
-
-.pb4 {
-  padding-bottom: 4px !important;
-}
-
-.pb0 {
-  padding-bottom: 0px !important;
-}
-
-/* Grid of unequally tall elements */
-.grid > [class*="col-md"] {
-  display: inline-block;
-  float: none;
-  vertical-align: top;
-  box-sizing: border-box;
-}
-.grid > [class*="col-md"].grid-align-top > [class*="col-md"] {
-  vertical-align: top;
-}
-.grid > [class*="col-md"].grid-align-middle > [class*="col-md"] {
-  vertical-align: middle;
-}
-.grid > [class*="col-md"].grid-align-bottom > [class*="col-md"] {
-  vertical-align: bottom;
-}
-
 /* Extra Styles */
 img.shadow {
   -webkit-border-radius: 3px;
@@ -186,9 +96,14 @@ h1.text-muted, h2.text-muted, h3.text-muted {
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
-.navbar.navbar-default.navbar-static-top {
+.navbar.navbar-static-top {
   margin-bottom: 0;
 }
+.navbar.navbar-static-top ul.nav > li.divider {
+  margin-top: 15px;
+  padding-top: 20px;
+  border-right: 1px solid grey;
+}
 
 /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
 html, body, #wrapwrap {
@@ -210,7 +125,7 @@ header, main, footer {
 footer {
   height: 100%;
   background: #eff8f8;
-  background: rgba(100, 200, 200, 0.1);
+  background: rgba(200, 200, 200, 0.1);
 }
 
 #footer_container {
@@ -442,7 +357,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 /* Background */
 .oe_dark {
   background: #eff8f8;
-  background: rgba(100, 200, 200, 0.14);
+  background: rgba(200, 200, 200, 0.14);
   -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
   -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
   box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
@@ -450,16 +365,55 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 
 .oe_black {
   background-color: rgba(0, 0, 0, 0.9);
+  color: white;
 }
 
 .oe_green {
-  background-color: rgba(0, 128, 0, 0.8);
+  background-color: #51d466;
+  color: white;
+}
+.oe_green .text-muted {
+  color: #dddddd;
+}
+
+.oe_blue_light {
+  background-color: #4791d2;
+  color: white;
+}
+.oe_blue_light .text-muted {
+  color: #dddddd;
+}
+
+.oe_blue {
+  background-color: #34495e;
+  color: white;
+}
+
+.oe_orange {
+  background-color: #e67e22;
+  color: white;
+}
+.oe_orange .text-muted {
+  color: #dddddd;
+}
+
+.oe_purple {
+  background-color: #b163a3;
+  color: white;
+}
+.oe_purple .text-muted {
+  color: #dddddd;
 }
 
 .oe_red {
-  background-color: rgba(255, 0, 0, 0.8);
+  background-color: #f75353;
+  color: white;
+}
+.oe_red .text-muted {
+  color: #dddddd;
 }
 
+/* Misc */
 .oe_img_bg {
   background-size: 100%;
 }
@@ -519,45 +473,3 @@ span[data-oe-type="monetary"] {
   -o-column-count: 3;
   column-count: 3;
 }
-
-.bs-callout {
-  margin: 20px 0;
-  padding: 20px;
-  border-left: 3px solid #eeeeee;
-}
-
-.bs-callout h4 {
-  margin-top: 0;
-  margin-bottom: 5px;
-}
-
-.bs-callout p:last-child {
-  margin-bottom: 0;
-}
-
-.bs-callout-danger {
-  background-color: #fdf7f7;
-  border-color: #eed3d7;
-}
-
-.bs-callout-danger h4 {
-  color: #b94a48;
-}
-
-.bs-callout-warning {
-  background-color: #faf8f0;
-  border-color: #faebcc;
-}
-
-.bs-callout-warning h4 {
-  color: #8a6d3b;
-}
-
-.bs-callout-info {
-  background-color: #f4f8fa;
-  border-color: #bce8f1;
-}
-
-.bs-callout-info h4 {
-  color: #34789a;
-}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index c509bebce55..7422a9008ba 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -51,57 +51,6 @@
 .mb0
     margin-bottom: 0px !important
 
-.pt128
-    padding-top: 128px !important
-.pt92
-    padding-top: 92px !important
-.pt64
-    padding-top: 64px !important
-.pt48
-    padding-top: 48px !important
-.pt32
-    padding-top: 32px !important
-.pt16
-    padding-top: 16px !important
-.pt8
-    padding-top: 8px !important
-.pt4
-    padding-top: 4px !important
-.pt0
-    padding-top: 0px !important
-
-.pb128
-    padding-bottom: 128px !important
-.pb92
-    padding-bottom: 92px !important
-.pb64
-    padding-bottom: 64px !important
-.pb48
-    padding-bottom: 48px !important
-.pb32
-    padding-bottom: 32px !important
-.pb16
-    padding-bottom: 16px !important
-.pb8
-    padding-bottom: 8px !important
-.pb4
-    padding-bottom: 4px !important
-.pb0
-    padding-bottom: 0px !important
-
-/* Grid of unequally tall elements */
-.grid > [class*="col-md"]
-    display: inline-block
-    float: none
-    vertical-align: top
-    box-sizing: border-box
-    &.grid-align-top > [class*="col-md"]
-        vertical-align: top
-    &.grid-align-middle > [class*="col-md"]
-        vertical-align: middle
-    &.grid-align-bottom > [class*="col-md"]
-        vertical-align: bottom
-
 /* Extra Styles */
 
 img.shadow
@@ -114,8 +63,13 @@ h1.text-muted, h2.text-muted, h3.text-muted
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 
-.navbar.navbar-default.navbar-static-top
+.navbar.navbar-static-top
     margin-bottom: 0
+    ul.nav
+        > li.divider
+            margin-top: 15px
+            padding-top: 20px
+            border-right: 1px solid grey
 
 /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
 
@@ -133,7 +87,7 @@ header, main, footer
 footer
     height: 100%
     background: rgb(239, 248, 248)
-    background: rgba(100, 200, 200, 0.1)
+    background: rgba(200, 200, 200, 0.1)
 
 #footer_container
     padding-top: 24px
@@ -330,17 +284,52 @@ div.carousel[data-snippet-id="slider"]
         padding: 32px 0
 
 /* Background */
- 
+
 .oe_dark
     background: #eff8f8
-    background: rgba(100, 200, 200, 0.14)
+    background: rgba(200, 200, 200, 0.14)
     +box-shadow(0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset)
+
 .oe_black
     background-color: rgba(0, 0, 0, 0.9)
+    color: white
+
 .oe_green
-    background-color: rgba(0, 128, 0, 0.8)
+    background-color: #51d466
+    color: white
+    .text-muted
+        color: #ddd
+
+.oe_blue_light
+    background-color: #4791d2
+    color: white
+    .text-muted
+        color: #ddd
+
+.oe_blue
+    background-color: #34495e
+    color: white
+
+.oe_orange
+    background-color: #e67e22
+    color: white
+    .text-muted
+        color: #ddd
+
+.oe_purple
+    background-color: #b163a3
+    color: white
+    .text-muted
+        color: #ddd
+
 .oe_red
-    background-color: rgba(255, 0, 0, 0.8)
+    background-color: #f75353
+    color: white
+    .text-muted
+        color: #ddd
+
+/* Misc */
+
 .oe_img_bg
     background-size: 100%
 
@@ -386,30 +375,3 @@ span[data-oe-type="monetary"]
 .oe_template_fallback
     @include column-count(3)
 
-// ---- Callouts from bootstrap doc ---- {{{
-.bs-callout
-    margin: 20px 0
-    padding: 20px
-    border-left: 3px solid #eee
-.bs-callout h4
-    margin-top: 0
-    margin-bottom: 5px
-.bs-callout p:last-child
-    margin-bottom: 0
-
-.bs-callout-danger
-    background-color: #fdf7f7
-    border-color: #eed3d7
-.bs-callout-danger h4
-    color: #b94a48
-.bs-callout-warning
-    background-color: #faf8f0
-    border-color: #faebcc
-.bs-callout-warning h4
-    color: #8a6d3b
-.bs-callout-info
-    background-color: #f4f8fa
-    border-color: #bce8f1
-.bs-callout-info h4
-    color: #34789a
-// }}}