summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2014-01-16 09:36:53 +0100
committerFabien Pinckaers <fp@tinyerp.com>2014-01-16 09:36:53 +0100
commit8bfed064590a19a7a78939ec6f0865715a33f13b (patch)
treecb1d62f40f538d7f0bb886d6602ac03b5f7b6d8d /addons/website/static/src/css
parent78b4f8fe8f769afdc447b47ac1dea991ee715d6c (diff)
[IMP] Small bootstrap fix for nested containers
bzr revid: fp@tinyerp.com-20140116083653-z3hk2w8ol6xrvgln
Diffstat (limited to 'addons/website/static/src/css')
-rw-r--r--addons/website/static/src/css/website.css7
-rw-r--r--addons/website/static/src/css/website.sass7
2 files changed, 13 insertions, 1 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 095f9bec8bb..f14a193ee16 100644
--- 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
@@ -96,6 +95,12 @@ h1.text-muted, h2.text-muted, h3.text-muted {
margin-top: 10px;
}
+/* ----- BOOTSTRAP FIX ----- */
+.container .container {
+ padding-left: 0;
+ padding-right: 0;
+}
+
/* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
.navbar.navbar-static-top {
margin-bottom: 0;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 56257628a22..69a50c0710b 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -61,6 +61,13 @@ img.shadow
h1.text-muted, h2.text-muted, h3.text-muted
margin-top: 10px
+/* ----- BOOTSTRAP FIX ----- */
+
+.container
+ .container
+ padding-left: 0
+ padding-right: 0
+
/* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
.navbar.navbar-static-top