summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-11-05 20:30:40 +0100
committerChristophe Simonis <chs@odoo.com>2014-11-05 20:30:40 +0100
commit5068cffbb043d7284014dcdd03b1794250631bc0 (patch)
tree9b942d8f8e193323aeb42665eab998f6831f1992 /addons/website/static/src/css
parent9c57268a4b191341c5c1377ec0b6e1f11c37c5cd (diff)
parent491372e865948765fdce241c7429419204ce6406 (diff)
[MERGE] forward port of branch 8.0 up to 491372e
Diffstat (limited to 'addons/website/static/src/css')
-rw-r--r--addons/website/static/src/css/website.css2
-rw-r--r--addons/website/static/src/css/website.sass2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 589faf1c038..c784f628d4e 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -179,7 +179,7 @@ footer {
background: rgba(200, 200, 200, 0.1);
}
-#footer_container {
+#footer_container, #footer {
padding-top: 24px;
padding-bottom: 12px;
}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index ac1397356b5..b121484c7af 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -137,7 +137,7 @@ footer
background: rgb(239, 248, 248)
background: rgba(200, 200, 200, 0.1)
-#footer_container
+#footer_container, #footer
padding-top: 24px
padding-bottom: 12px