[IMP] cleaned CSS, removed CSS

bzr revid: fp@tinyerp.com-20140114212533-iz4oleo0opads01l

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index a047753..c8ed42e 100644 (file)
--- 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 {
@@ -519,45 +434,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 c509beb..58a3660 100644 (file)
--- 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 ----- */
 
@@ -386,30 +340,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
-// }}}

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index de91cd3..0e2173f 100644 (file)
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -96,12 +96,13 @@
                                     <t t-foreach="website.menu_id.child_id" t-as="submenu">
                                         <t t-call="website.submenu"/>
                                     </t>
+                                    <li class="divider"/>
                                     <li class="dropdown" t-ignore="true" t-if="user_id.id != website.public_user.id">
                                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                            <span class="badge">
+                                            <b class="badge">
                                                 <span t-esc="user_id.name"/>
                                                 <span class="caret"></span>
-                                            </span>
+                                            </b>
                                         </a>
                                         <ul class="dropdown-menu js_usermenu" role="menu">
                                             <li><a href="/web" role="menuitem">Administration</a></li>
@@ -235,7 +236,7 @@
     <xpath expr="//ul[@id='top_menu']" position="inside">
         <li t-if="user_id.id == website.public_user.id">
             <a t-attf-href="/web#redirect=#{ quote_plus(url_for('', keep_query='*')) }">
-                <span class="badge">Sign in</span>
+                <b>Sign in</b>
             </a>
         </li>
     </xpath>
@@ -533,7 +534,7 @@
                     </div>
 
                     <div class="container" t-if="views">
-                        <div class="bs-callout bs-callout-danger" t-if="qweb_template and editable">
+                        <div class="alert alert-danger" t-if="qweb_template and editable">
                             <h4>Template fallback</h4>
                             <p>An error occured while rendering the template <code t-esc="qweb_template"/>.</p>
                             <p>If this error is caused by a change of yours in the templates, you have the possibility to reset one or more templates to their <strong>factory settings</strong>.</p>

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 902bb9e..78c360b 100644 (file)
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -51,7 +51,7 @@
 
 <template id="products_cart" name="Shopping cart">
   <div class="ribbon-wrapper">
-    <div class="ribbon btn btn-danger">Promo</div>
+    <div class="ribbon btn btn-danger">Sale</div>
   </div>
   <div class="oe_product_image">
       <a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filters">