[MERGE] forward port of branch saas-6 up to e9f1ee4

3 files changed, 11 insertions, 5 deletions

diff --git a/addons/website/static/src/css/common.css b/addons/website/static/src/css/common.css
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/addons/website/static/src/css/common.css
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 2b7cc4d4481..963ecd40046 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -120,7 +120,7 @@ hr {
   font-size: 120%;
 }
 
-.jumbotron.para_large p{
+.jumbotron.para_large p {
   font-size: 150%;
 }
 
@@ -184,7 +184,6 @@ body > nav.navbar {
   }
 }
 /* ----- BOOTSTRAP FIX ----- */
-
 @-moz-document url-prefix() {
   .table .img-responsive {
     width: 100%;
@@ -753,6 +752,10 @@ div.carousel .item.text_only .container > .carousel-image {
   margin-right: 0 !important;
 }
 
+/* ---- footer style ---- {{{ */
+#footer div.row {
+  word-wrap: break-word;
+}
 .container nav#oe_main_menu_navbar {
   position: inherit;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 11049bba0e9..028bd25f41e 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -90,9 +90,8 @@ hr
 .para_large
     font-size: 120%
 
-.jumbotron.para_large p{
-  font-size: 150%;
-}
+.jumbotron.para_large p
+    font-size: 150%
 
 .readable
     font-size: 120%
@@ -616,6 +615,10 @@ div.carousel
     .navbar-nav.navbar-right:last-child
         margin-right: 0 !important
 
+/* ---- footer style ---- {{{ */
+#footer div.row
+    word-wrap: break-word
+
 .container
     nav#oe_main_menu_navbar
         position: inherit