[MERGE] from upstream

bzr revid: fva@openerp.com-20130805120523-ux0vnixhbe59pvrf
bzr revid: fva@openerp.com-20130805123836-1vhj1e5mb0ejiu9j

4 files changed, 188 insertions, 25 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 7cd68099e2c..31601a63230 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -45,3 +45,11 @@
 .oe_editable:focus {
   outline: #80b5f2 solid 5px !important;
 }
+
+.oe_carousel_options {
+  cursor: pointer;
+  position: absolute;
+  white-space: nowrap;
+  z-index: 1;
+  display: none;
+}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f1208ca2a80..f7e46cd19d1 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -40,3 +40,10 @@
 
 .oe_editable:focus
     outline: #80B5F2 solid 5px !important
+
+.oe_carousel_options
+    cursor: pointer
+    position: absolute
+    white-space: nowrap
+    z-index: 1
+    display: none
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 0ff1d410de7..5959e1c9dda 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,3 +1,11 @@
+/*       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
+ *
+ * css for editor buttons, openerp widget included in the website and other
+ * stuff must go to the editor.css 
+ *
+ */
+/* ----- GENERIC LAYOUTING HELPERS ---- */
+/* Vertical Spacing */
 .mt128 {
   margin-top: 128px !important;
 }
@@ -34,6 +42,88 @@
   margin-top: 0px !important;
 }
 
+.mb128 {
+  margin-bottom: 128px !important;
+}
+
+.mb92 {
+  margin-bottom: 92px !important;
+}
+
+.mb64 {
+  margin-bottom: 64px !important;
+}
+
+.mb48 {
+  margin-bottom: 48px !important;
+}
+
+.mb32 {
+  margin-bottom: 32px !important;
+}
+
+.mb16 {
+  margin-bottom: 16px !important;
+}
+
+.mb8 {
+  margin-bottom: 8px !important;
+}
+
+.mb4 {
+  margin-bottom: 4px !important;
+}
+
+.mb0 {
+  margin-bottom: 0px !important;
+}
+
+/* Grid of unequally tall elements */
+.grid > [class*="span"] {
+  display: inline-block;
+  float: none;
+  vertical-align: top;
+  margin-right: -4px;
+  box-sizing: border-box;
+}
+.grid > [class*="span"].grid-align-top > [class*="span"] {
+  vertical-align: top;
+}
+.grid > [class*="span"].grid-align-middle > [class*="span"] {
+  vertical-align: middle;
+}
+.grid > [class*="span"].grid-align-bottom > [class*="span"] {
+  vertical-align: bottom;
+}
+
+/* Table with two collumns aligned on the center */
+.table-equalized {
+  width: 100%;
+}
+.table-equalized td:first-child {
+  width: 50%;
+  text-align: right;
+  padding-right: 1em;
+  vertical-align: bottom;
+}
+.table-equalized td:last-child {
+  width: 50%;
+  text-align: left;
+  vertical-align: bottom;
+}
+
+/* Theming pagination inside navbar */
+.navbar-inner > .pagination {
+  margin: 6px 0;
+}
+.navbar-inner > .pagination ul {
+  position: relative;
+  top: 2px;
+  border: solid 2px rgba(0, 0, 0, 0.05);
+  border-radius: 8px;
+}
+
+/* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
 html, body {
   height: 100%;
   box-sizing: border-box;
@@ -57,6 +147,7 @@ footer {
   padding-bottom: 64px;
 }
 
+/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
 .subheader {
   letter-spacing: 3px;
   font-weight: 300;
@@ -75,10 +166,16 @@ h5 {
   font-weight: bold;
 }
 
+#myCarousel .item {
+  min-height: 300px;
+  color: white;
+}
+
 .nav > .pull-right {
   float: right !important;
 }
 
+/* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 .navbar .nav > li > p {
   margin-bottom: 0px;
 }
@@ -98,16 +195,3 @@ h5 {
 .nav > li a {
   display: block;
 }
-
-#myCarousel .item {
-  min-height: 300px;
-  color: white;
-}
-
-.carousel > .css_carousel_options {
-    cursor: pointer;
-    position: absolute;
-    white-space: nowrap;
-    z-index: 1;
-    display: none;
-}
\ No newline at end of file
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 08848fb0346..7c5f8cb6ce5 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -1,5 +1,16 @@
 @charset "utf-8"
 
+/* 
+ *       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
+ *
+ * css for editor buttons, openerp widget included in the website and other
+ * stuff must go to the editor.css 
+ *
+ */
+
+/* ----- GENERIC LAYOUTING HELPERS ---- */
+
+/* Vertical Spacing */
 .mt128
     margin-top: 128px !important
 .mt92
@@ -19,6 +30,62 @@
 .mt0
     margin-top: 0px !important
 
+.mb128
+    margin-bottom: 128px !important
+.mb92
+    margin-bottom: 92px !important
+.mb64
+    margin-bottom: 64px !important
+.mb48
+    margin-bottom: 48px !important
+.mb32
+    margin-bottom: 32px !important
+.mb16
+    margin-bottom: 16px !important
+.mb8
+    margin-bottom: 8px !important
+.mb4
+    margin-bottom: 4px !important
+.mb0
+    margin-bottom: 0px !important
+
+/* Grid of unequally tall elements */
+.grid > [class*="span"]
+    display: inline-block
+    float: none
+    vertical-align: top
+    margin-right: -4px
+    box-sizing: border-box
+    &.grid-align-top > [class*="span"]
+        vertical-align: top
+    &.grid-align-middle > [class*="span"]
+        vertical-align: middle
+    &.grid-align-bottom > [class*="span"]
+        vertical-align: bottom
+
+/* Table with two collumns aligned on the center */
+.table-equalized
+    width: 100%
+    td:first-child
+        width: 50%
+        text-align: right
+        padding-right: 1em
+        vertical-align: bottom
+    td:last-child
+        width: 50%
+        text-align: left
+        vertical-align: bottom
+
+/* Theming pagination inside navbar */
+.navbar-inner > .pagination
+    margin: 6px 0
+    ul
+        position: relative
+        top: 2px
+        border: solid 2px rgba(0,0,0,0.05)
+        border-radius: 8px
+
+/* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
 
 html,body
     height: 100%
@@ -39,8 +106,8 @@ footer
     background: rgb(239, 248, 248) // rgb(221, 235, 227)
     padding-top: 64px
     padding-bottom: 64px
-    //*
-        color: #1abc9c !important
+
+/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
 
 .subheader
     letter-spacing: 3px   
@@ -56,9 +123,16 @@ header.navbar-fixed-top
 h5
     font-weight: bold 
 
+#myCarousel .item
+    min-height: 300px
+    color: white
+
+
 .nav > .pull-right
     float: right !important //bugfix for flatly theme
 
+/* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
+
 .navbar .nav > li > p
     margin-bottom: 0px
 
@@ -75,13 +149,3 @@ h5
 .nav > li  a 
     display: block
 
-#myCarousel .item
-    min-height: 300px
-    color: white
-
-.carousel > .css_carousel_options
-    cursor: pointer
-    position: absolute
-    white-space: nowrap
-    z-index: 1
-    display: none
\ No newline at end of file