diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-09-23 12:56:04 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-09-23 12:56:04 +0200 |
| commit | 5bd6c371d0300fd23c693ae3ecdaa572db3e67b4 (patch) | |
| tree | a36565c2858e00372471ebde3b55634a731f66e5 /addons/website/static/src/css | |
| parent | b1fc013fae5f7dbc962f0fb04a2835db07efe83e (diff) | |
[IMP] website snippet: carousel options with sub menu. Change on mouse hover
bzr revid: chm@openerp.com-20130923105604-w8dukt0u8bdxw5ui
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/snippets.css | 21 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.css | 11 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 9 |
3 files changed, 28 insertions, 13 deletions
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 628689b78cf..35d78303aae 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -1,3 +1,13 @@ +/* add CSS for bootstrap dropdown multi level */ +.dropdown-submenu{position:relative;} +.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} +.dropdown-submenu:hover>.dropdown-menu{display:block;} +.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;} +.dropdown-submenu:hover>a:after{border-left-color:#ffffff;} +.dropdown-submenu.pull-left{float:none;} +.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} + + /* .oe_snippet_demo .oe_page{ margin-top: 50px; @@ -208,14 +218,3 @@ min-width: 10px; } - -/* Custom CSS for snippets */ -.carousel.oe_small .carousel-inner { - height: 200px; -} -.carousel.oe_medium .carousel-inner { - height: 300px; -} -.carousel.oe_big .carousel-inner { - height: 450px; -} diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 261d89b40e8..98851e748b5 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -247,6 +247,15 @@ footer { height: 100%; } +.carousel.oe_small .carousel-inner { + height: 200px; +} +.carousel.oe_medium .carousel-inner { + height: 300px; +} +.carousel.oe_big .carousel-inner { + height: 450px; +} .carousel .carousel-caption h1, .carousel .carousel-caption h2, .carousel .carousel-caption h3 { margin-top: 10px; margin-bottom: 10px; @@ -272,7 +281,7 @@ footer { background: rgba(0, 0, 0, 0.4); } .carousel .item.text_only .carousel-image { - display: none; + display: none !important; } .carousel .item.text_only .carousel-caption { left: 10%; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a289436d63a..310d1ccdca0 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -177,7 +177,14 @@ footer .carousel-inner .item height: 100% + .carousel + &.oe_small .carousel-inner + height: 200px + &.oe_medium .carousel-inner + height: 300px + &.oe_big .carousel-inner + height: 450px .carousel-caption h1, h2, h3 margin-top: 10px @@ -202,7 +209,7 @@ footer background: rgba(0, 0, 0, 0.4) .item.text_only .carousel-image - display: none + display: none !important .carousel-caption left: 10% right: 10% |
