diff options
| author | Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com> | 2014-02-25 11:02:04 +0530 |
|---|---|---|
| committer | Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com> | 2014-02-25 11:02:04 +0530 |
| commit | c6917b9c074f3f2c19cac1dc3e05c8a3d2cadbed (patch) | |
| tree | 6a17e259f27e029458207671d10fec50b5c425be /addons/website/static/src/css/website.sass | |
| parent | b2688a37f84a505d8e334f8b0325b4747d440170 (diff) | |
| parent | 9eb2db4465cefa5dc331123c1b0a4df035545015 (diff) | |
[MERGE] with trunk-survey2-rim addons branch
bzr revid: dizzy.zala@gmail.com-20140225053204-mra08nfvumkxyixa
Diffstat (limited to 'addons/website/static/src/css/website.sass')
| -rw-r--r-- | addons/website/static/src/css/website.sass | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 2c5f691fae6..2390464bfa7 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -128,10 +128,6 @@ footer float: left width: 100% -.row - min-height: 32px - width: 100% - /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child @@ -228,19 +224,24 @@ ul.nav-stacked > li > a a color: white + /* ---- SNIPPETS --- */ + +.oe_img_bg + background-size: 100% + [data-snippet-id],.colmd,.hr,.blockquote overflow: hidden @media (max-width: 400px) - [data-snippet-id] + [data-snippet-id]:not([data-snippet-id="carousel"]) height: auto !important .carousel-inner height: 100% .item height: 100% - background-size: 100% + background-size: cover .carousel .carousel-caption left: auto @@ -300,7 +301,7 @@ div.carousel[data-snippet-id="slider"] .parallax position: relative - background-size: 100% + background-size: cover display: table width: 100% min-height: 100px @@ -327,13 +328,13 @@ div.carousel[data-snippet-id="slider"] color: white .oe_green - background-color: #51d466 + background-color: #169C78 color: white .text-muted color: #ddd .oe_blue_light - background-color: #4791d2 + background-color: #41b6ab color: white .text-muted color: #ddd @@ -343,7 +344,7 @@ div.carousel[data-snippet-id="slider"] color: white .oe_orange - background-color: #e67e22 + background-color: #f05442 color: white .text-muted color: #ddd @@ -355,16 +356,13 @@ div.carousel[data-snippet-id="slider"] color: #ddd .oe_red - background-color: #f75353 + background-color: #9C1b31 color: white .text-muted color: #ddd /* Misc */ -.oe_img_bg - background-size: 100% - .texttop vertical-align: top |