[IMP] website_sale: responsible design (css height)

bzr revid: chm@openerp.com-20130927152625-mrr0r2514qfwyisp

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 5a739ce..a808b9b 100644 (file)
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -260,10 +260,6 @@ table.editorbar-panel td.selected {
 }
 
 /* ---- SNIPPETS DROP ZONES ---- */
 }
 
 /* ---- SNIPPETS DROP ZONES ---- */

-.col-md-12 {
-  float: left;
-}
-

 .oe_drop_zone.oe_insert {
   display: block;
   height: 48px;
 .oe_drop_zone.oe_insert {
   display: block;
   height: 48px;

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index bf8e7c1..406b8fe 100644 (file)
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -225,9 +225,6 @@ table.editorbar-panel
 
 /* ---- SNIPPETS DROP ZONES ---- */
 
 
 /* ---- SNIPPETS DROP ZONES ---- */
 

-
-.col-md-12
-    float: left

 .oe_drop_zone.oe_insert
     display: block
     height: 48px
 .oe_drop_zone.oe_insert
     display: block
     height: 48px

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index b1c4122..f037f87 100644 (file)
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -216,6 +216,12 @@ footer {
   padding-bottom: 12px;
 }
 
   padding-bottom: 12px;
 }
 

+/* ----- BOOTSTRAP FIX ----- */
+.col-md-12 {
+  float: left;
+  width: 100%;
+}
+

 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
   background-image: url("/website/static/src/img/drag_here.png");
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
   background-image: url("/website/static/src/img/drag_here.png");

diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index d80d766..ac85bf6 100644 (file)
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -143,6 +143,12 @@ footer
     padding-top: 24px
     padding-bottom: 12px
 
     padding-top: 24px
     padding-bottom: 12px
 

+/* ----- BOOTSTRAP FIX ----- */
+
+.col-md-12
+    float: left
+    width: 100%
+

 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
 .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
 .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child

diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 38ef892..c477ce7 100644 (file)
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -86,31 +86,85 @@
 
 /* ---- Product Sizes ---- */
 .col-md-12 .oe-height-1 {
 
 /* ---- Product Sizes ---- */
 .col-md-12 .oe-height-1 {

-  height: 125px;
+  height: 75px;

 }
 .col-md-12 .oe-height-2 {
 }
 .col-md-12 .oe-height-2 {

-  height: 250px;
+  height: 150px;

 }
 .col-md-12 .oe-height-3 {
 }
 .col-md-12 .oe-height-3 {

-  height: 375px;
+  height: 225px;

 }
 .col-md-12 .oe-height-4 {
 }
 .col-md-12 .oe-height-4 {

-  height: 499.9px;
+  height: 300px;

 }
 
 .col-md-9 .oe-height-1 {
 }
 
 .col-md-9 .oe-height-1 {

-  height: 95px;
+  height: 70px;

 }
 .col-md-9 .oe-height-2 {
 }
 .col-md-9 .oe-height-2 {

-  height: 190px;
+  height: 140px;

 }
 .col-md-9 .oe-height-3 {
 }
 .col-md-9 .oe-height-3 {

-  height: 285px;
+  height: 210px;

 }
 .col-md-9 .oe-height-4 {
 }
 .col-md-9 .oe-height-4 {

-  height: 380px;
+  height: 280px;
+}
+
+@media (min-width: 992px) {
+  .col-md-12 .oe-height-1 {
+    height: 95px;
+  }
+  .col-md-12 .oe-height-2 {
+    height: 190px;
+  }
+  .col-md-12 .oe-height-3 {
+    height: 285px;
+  }
+  .col-md-12 .oe-height-4 {
+    height: 380px;
+  }
+
+  .col-md-9 .oe-height-1 {
+    height: 72px;
+  }
+  .col-md-9 .oe-height-2 {
+    height: 144px;
+  }
+  .col-md-9 .oe-height-3 {
+    height: 216px;
+  }
+  .col-md-9 .oe-height-4 {
+    height: 288px;
+  }
+}
+@media (min-width: 1200px) {
+  .col-md-12 .oe-height-1 {
+    height: 125px;
+  }
+  .col-md-12 .oe-height-2 {
+    height: 250px;
+  }
+  .col-md-12 .oe-height-3 {
+    height: 375px;
+  }
+  .col-md-12 .oe-height-4 {
+    height: 499.9px;
+  }
+
+  .col-md-9 .oe-height-1 {
+    height: 95px;
+  }
+  .col-md-9 .oe-height-2 {
+    height: 190px;
+  }
+  .col-md-9 .oe-height-3 {
+    height: 285px;
+  }
+  .col-md-9 .oe-height-4 {
+    height: 380px;
+  }

 }
 }

-

 /* ---- Product list style ---- */
 .oe_list_products {
   border: none;
 /* ---- Product list style ---- */
 .oe_list_products {
   border: none;

diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index fdfb8a0..b96b590 100644 (file)
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -84,25 +84,64 @@
         bottom: 0
 
 /* ---- Product Sizes ---- */
         bottom: 0
 
 /* ---- Product Sizes ---- */

-

 .col-md-12
     .oe-height-1
 .col-md-12
     .oe-height-1

-        height: 125px
+        height: 75px

     .oe-height-2
     .oe-height-2

-        height: 250px
+        height: 150px

     .oe-height-3
     .oe-height-3

-        height: 375px
+        height: 225px

     .oe-height-4
     .oe-height-4

-        height: 499.9px
+        height: 300px

 .col-md-9
     .oe-height-1
 .col-md-9
     .oe-height-1

-        height: 95px
+        height: 70px

     .oe-height-2
     .oe-height-2

-        height: 190px
+        height: 140px

     .oe-height-3
     .oe-height-3

-        height: 285px
+        height: 210px

     .oe-height-4
     .oe-height-4

-        height: 380px
+        height: 280px
+
+@media (min-width: 992px)
+    .col-md-12
+        .oe-height-1
+            height: 95px
+        .oe-height-2
+            height: 190px
+        .oe-height-3
+            height: 285px
+        .oe-height-4
+            height: 380px
+    .col-md-9
+        .oe-height-1
+            height: 72px
+        .oe-height-2
+            height: 144px
+        .oe-height-3
+            height: 216px
+        .oe-height-4
+            height: 288px
+
+@media (min-width: 1200px)
+    .col-md-12
+        .oe-height-1
+            height: 125px
+        .oe-height-2
+            height: 250px
+        .oe-height-3
+            height: 375px
+        .oe-height-4
+            height: 499.9px
+    .col-md-9
+        .oe-height-1
+            height: 95px
+        .oe-height-2
+            height: 190px
+        .oe-height-3
+            height: 285px
+        .oe-height-4
+            height: 380px

 
 
 /* ---- Product list style ---- */
 
 
 /* ---- Product list style ---- */

diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/website_sale_demo.xml
index 7fdf48a..35b1c91 100644 (file)
--- a/addons/website_sale/website_sale_demo.xml
+++ b/addons/website_sale/website_sale_demo.xml
@@ -64,6 +64,7 @@
         </record>
         <record id="product.product_product_6" model="product.product">
             <field name="website_published" eval="True"/>
         </record>
         <record id="product.product_product_6" model="product.product">
             <field name="website_published" eval="True"/>

+            <field name="website_sequence">4</field>

             <field name="website_style_ids" eval="[(6,0,[ref('website_sale.image_full')])]"/>
         </record>
         <record id="product.product_product_7" model="product.product">
             <field name="website_style_ids" eval="[(6,0,[ref('website_sale.image_full')])]"/>
         </record>
         <record id="product.product_product_7" model="product.product">

@@ -77,6 +78,7 @@
         </record>
         <record id="product.product_product_11" model="product.product">
             <field name="website_published" eval="True"/>
         </record>
         <record id="product.product_product_11" model="product.product">
             <field name="website_published" eval="True"/>

+            <field name="website_sequence">3</field>

             <field name="website_size_y">2</field>
         </record>
 
             <field name="website_size_y">2</field>
         </record>