diff options
| author | Jeremy Kersten <jke@odoo.com> | 2015-09-25 16:37:25 +0200 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2015-09-25 16:38:09 +0200 |
| commit | fe3e91d1ff9534c2bbd131fbaec39ff2d2db6248 (patch) | |
| tree | 4966fa5f4c3ccea69adddf832bd141119856fef3 /addons/website | |
| parent | d8f5b28554a0820d32952b3898823c4ba95436cc (diff) | |
[FIX] website: fix footer
Inconsistency between col-md and col-lg (offset)
Add auto word wrap to avoid that text override next column
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/static/src/css/common.css | 0 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.css | 11 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 11 | ||||
| -rw-r--r-- | addons/website/views/website_templates.xml | 6 |
4 files changed, 16 insertions, 12 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 c0043c945a5..619638ad254 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -214,7 +214,7 @@ li > p { } font[style*='background'], font[class*='bg-'] { - padding: 0 2px + padding: 0 2px; } .o_ul_toggle_self, .o_ul_toggle_next { @@ -287,7 +287,7 @@ td { font-size: 120%; } -.jumbotron.para_large p{ +.jumbotron.para_large p { font-size: 150%; } @@ -355,9 +355,7 @@ body > nav.navbar { padding-top: 34px; } } - /* ----- BOOTSTRAP FIX ----- */ - @-moz-document url-prefix() { .table .img-responsive { width: 100%; @@ -988,4 +986,7 @@ div.carousel .item.text_only .container > .carousel-image { margin-right: 0 !important; } -/*# sourceMappingURL=website.css.map */ +/* ---- footer style ---- {{{ */ +#footer div.row { + word-wrap: break-word; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a53e5254708..4d2ee2fded2 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -191,9 +191,8 @@ td .para_large font-size: 120% -.jumbotron.para_large p{ - font-size: 150%; -} +.jumbotron.para_large p + font-size: 150% .readable font-size: 120% @@ -245,7 +244,7 @@ body > nav.navbar width: 100% position: absolute z-index: 10000 -@media (max-min: 767px) +@media (min-width: 767px) nav.navbar + #wrapwrap padding-top: 34px @@ -785,3 +784,7 @@ div.carousel font-size: 13px .navbar-nav.navbar-right:last-child margin-right: 0 !important + +/* ---- footer style ---- {{{ */ +#footer div.row + word-wrap: break-word diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 6fc55be8e96..c223a40ff50 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -369,13 +369,13 @@ <xpath expr="//div[@id='footer']" position="replace"> <div id="footer" class="container hidden-print"> <div class="row"> - <div class="col-md-3"> + <div class="col-md-4 col-lg-3"> <h4>Our products & Services</h4> <ul class="list-unstyled" id="products"> <li><a href="/">Home</a></li> </ul> </div> - <div class="col-md-3" id="info"> + <div class="col-md-4 col-lg-3" id="info"> <h4>Connect with us</h4> <ul class="list-unstyled"> <li><a href="/page/website.contactus">Contact us</a></li> @@ -393,7 +393,7 @@ <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a> </h2> </div> - <div class="col-md-5 col-lg-offset-1"> + <div class="col-md-4 col-lg-5 col-lg-offset-1"> <h4> <span t-field="res_company.name" /> <small> - <a href="/page/website.aboutus">About us</a></small> |
