[MERGE] from website-al

bzr revid: chm@openerp.com-20130906083500-4n5knaxiqt4cg2ht

1 files changed, 80 insertions, 45 deletions

diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 8b885c548d1..b5468a4b0e8 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -50,76 +50,111 @@
     margin-bottom: 0px !important
 
 /* Grid of unequally tall elements */
-.grid > [class*="span"]
+.grid > [class*="col-md"]
     display: inline-block
     float: none
     vertical-align: top
-    margin-right: -4px
     box-sizing: border-box
-    &.grid-align-top > [class*="span"]
+    &.grid-align-top > [class*="col-md"]
         vertical-align: top
-    &.grid-align-middle > [class*="span"]
+    &.grid-align-middle > [class*="col-md"]
         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
+    &.grid-align-bottom > [class*="col-md"]
         vertical-align: bottom
 
 /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
 
 html,body
-    height: 100%
     box-sizing: border-box
-    position: relative
-
-#wrap
-    min-height: 100%
-    height: auto !important
     height: 100%
-    margin: 0 auto -300px
-    padding: 0 0 364px
-    box-sizing: border-box
 
+body
+    display: table
+    width: 100%
+
+header, #wrap, footer
+    display: table-row
+ 
 footer
-    box-sizing: border-box
-    height: 380px
-    background: rgb(239, 248, 248) // rgb(221, 235, 227)
-    padding-top: 48px
-    padding-bottom: 48px
+    height: 100%
+    background: rgb(239, 248, 248)
+    background: rgba(100, 200, 200, 0.1)
 
+#footer_container
+    padding-top: 24px
+    padding-bottom: 12px
 
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
 .navbar .nav > li > p
     margin-bottom: 0px
 
-.navbar .nav > li  a
-    text-shadow: none
-
-.nav > li  a 
-    display: block
+// .navbar .nav > li  a
+//     text-shadow: none
 
-/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
-
-header.navbar-fixed-top
-    position: static
+// .nav > li  a 
+//     display: block
 
 #myCarousel .item
-    min-height: 300px
     color: white
 
-.dark
-    background: rgb(239, 248, 248)
-
+/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
 
+.dark
+    background: #eff8f8
+    background: rgba(100, 200, 200, 0.1)
+    -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
+
+.nav-hierarchy
+    padding-left: 16px
+
+div#wrap
+    .carousel
+        top: -20px
+
+/* -- 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
+
+#customize-menu
+    .dropdown-header
+        text-transform: uppercase
+
+/* ---- PUBLISH ---- */
+a[data-publish]
+    text-decoration: none !important
+    z-index: 2
+    .label
+        padding: 5px 8px
+    .css_unpublish, .css_publish, .css_unpublished, .css_published
+        display: none
+    &[data-publish='off']
+        .css_unpublished, &:hover .css_publish
+            display: inline
+        &:hover .css_unpublished
+            display: none
+    &[data-publish='on']
+        .css_published, &:hover .css_unpublish
+            display: inline
+        &:hover .css_published
+            display: none
+
+[data-publish='off']:not(a)
+    >:not([data-publish])
+        opacity: 0.5
+[data-publish]:not(a)
+    position: relative
+    overflow: visible
+    >[data-publish]
+        position: absolute
+        right: -6px
+        top: -10px
+        display: none
+    &:hover > [data-publish]
+        display: block
\ No newline at end of file