From a83f1282fa3a80982faf5623186b6677deb0d088 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 19 Jan 2014 20:35:27 +0100
Subject: [PATCH] [IMP] CSS for logo, one pixel better

bzr revid: fp@tinyerp.com-20140119193527-8e7oc1umebqkqxgx
---
 addons/website/static/src/css/website.css  | 7 ++++---
 addons/website/static/src/css/website.sass | 6 +++---
 addons/website/views/website_templates.xml | 2 +-
 addons/website_sale/views/website_sale.xml | 8 ++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index efffd3b7318..b5e3654424d 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -95,10 +95,11 @@ h1.text-muted, h2.text-muted, h3.text-muted {
   margin-top: 10px;
 }
 
+header a.navbar-brand.logo {
+  padding: 0;
+}
 header a.navbar-brand img {
   max-height: 50px;
-  margin-top: -15px;
-  margin-bottom: -15px;
 }
 
 /* ----- BOOTSTRAP FIX ----- */
@@ -173,7 +174,7 @@ footer {
 }
 
 .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before {
-  content: "This page is under construction";
+  content: "Page under construction";
   text-align: center;
   display: block;
   padding-top: 160px;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 976d356512f..f7a0ddb8b36 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -62,11 +62,11 @@ h1.text-muted, h2.text-muted, h3.text-muted
     margin-top: 10px
 
 header
+    a.navbar-brand.logo
+        padding: 0
     a.navbar-brand
         img
             max-height: 50px
-            margin-top: -15px
-            margin-bottom: -15px
 
 /* ----- BOOTSTRAP FIX ----- */
 
@@ -132,7 +132,7 @@ footer
     position: static
 
 .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
-    content: 'This page is under construction'
+    content: 'Page under construction'
     text-align: center
     display: block
     padding-top: 160px
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 7411a6bd5e5..3fa40e1a5c0 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -197,7 +197,7 @@
 
 <template id="layout_logo_show" inherit_option_id="website.layout" name="Show Logo">
     <xpath expr="//header//a[@class='navbar-brand']" position="replace">
-        <a href="/" class="navbar-brand">
+        <a href="/" class="navbar-brand logo">
             <img src="/website/static/src/img/odoo_logo.png"/>
         </a>
     </xpath>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 45795839c5a..d602b9bef35 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -937,12 +937,12 @@
             </div>
           </div>
 
-          <div class="js_payment mb64 row" t-if="acquirers" id="payment_method">
-              <h4>Choose your Payment Method</h4>
+          <div class="js_payment mb64" t-if="acquirers" id="payment_method">
               <div class="col-lg-5 col-sm-6">
+                  <h4>Payment Method:</h4>
                   <t t-foreach="acquirers or []" t-as="acquirer">
                       <label t-if="acquirer.button" class="oe_sale_acquirer_logo" style="display: block;">
-                          <input t-att-value="acquirer.id" type="radio" name="acquirer"/>
+                          <input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer"/>
                           <img class="media-object" style="width: 60px; display: inline-block;"
                               t-att-title="acquirer.name"
                               t-att-src="'/payment_acquirer_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
@@ -951,7 +951,7 @@
               </div>
               <div class="col-lg-3 col-sm-3">
                   <t t-foreach="acquirers or []" t-as="acquirer">
-                      <div t-att-data-id="acquirer.id" t-raw="acquirer.button" class="oe_sale_acquirer_button hidden"/>
+                      <div t-att-data-id="acquirer.id" t-raw="acquirer.button" class="oe_sale_acquirer_button hidden pull-right"/>
                   </t>
               </div>
           </div>