diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-09-23 14:56:06 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-09-23 14:56:06 +0200 |
| commit | 7ed222baf344d1edec4c3e5014370403d15f9dd3 (patch) | |
| tree | 8d72a518cca5a6c9a94a923628114e3d46544330 /addons/website/static/src/css | |
| parent | e72e65b6fd93104206631ec871f953fd0e30d0fb (diff) | |
| parent | fdd1aa5e37d51d118461c7090d10fb844df12c36 (diff) | |
[IMP] website: name connected user; carousel selection; imp drop zone
bzr revid: chm@openerp.com-20130923125606-b6pcr52dai0yh2ia
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 | 25 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 19 |
3 files changed, 52 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 c48d4fa9b2a..20a0968347a 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -246,6 +246,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; @@ -271,7 +280,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%; @@ -291,6 +300,20 @@ footer { right: 50%; left: 10%; } +.carousel .carousel-control { + cursor: pointer; +} +.carousel .carousel-control span { + top: 50%; + position: absolute; + margin-top: -8px; +} +.carousel .carousel-control.left span { + left: 10px; +} +.carousel .carousel-control.right span { + right: 10px; +} /* ---- HOMEPAGE THEME CUSTOMIZATION ---- */ .dark { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 9f7efa2c416..2511cb55d9e 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% @@ -219,6 +226,16 @@ footer .carousel-image right: 50% left: 10% + .carousel-control + cursor: pointer + span + top: 50% + position: absolute + margin-top: -8px + &.left span + left: 10px + &.right span + right: 10px /* ---- HOMEPAGE THEME CUSTOMIZATION ---- */ |
