diff --git a/addons/website/static/src/css/website-flatly.css b/addons/website/static/src/css/website-flatly.css index e06de976539..fb50b34062b 100644 --- a/addons/website/static/src/css/website-flatly.css +++ b/addons/website/static/src/css/website-flatly.css @@ -6,40 +6,6 @@ * */ /* ----- GENERIC LAYOUTING HELPERS ---- */ -/* 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; diff --git a/addons/website/static/src/css/website-flatly.sass b/addons/website/static/src/css/website-flatly.sass index 892e3b08f44..0244d8b7511 100644 --- a/addons/website/static/src/css/website-flatly.sass +++ b/addons/website/static/src/css/website-flatly.sass @@ -10,33 +10,6 @@ /* ----- GENERIC LAYOUTING HELPERS ---- */ -/* 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 diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index c19576b0a3f..eea25bea19d 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -79,6 +79,40 @@ 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; +} + /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */ html, body { height: 100%; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a8ae998b1ec..13037deb2d7 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -49,6 +49,33 @@ .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 + /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */ html,body diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 6599f3419db..4297561bc4f 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -100,10 +100,21 @@
- - - - +
+ +
+
+ + + +
+
+
€
+ +
+
@@ -113,24 +124,6 @@ - -