summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-07-22 16:17:54 +0200
committerChristophe Simonis <chs@odoo.com>2015-07-22 16:17:54 +0200
commit2cf91d16a5f844a2a3d5d22c025c180a6615bab8 (patch)
treea7bc3974a9c349ae1575fd3b10bbb25d9b74b9ab /addons/website/static/src/css
parentd74e0c3e9d9cd80bf532ba90f7c634ff55881b51 (diff)
parent63e92cbc9621813a276e340b7d961cbd8f8b97c4 (diff)
[MERGE] forward port of branch saas-6 up to 63e92cb
Diffstat (limited to 'addons/website/static/src/css')
-rw-r--r--addons/website/static/src/css/snippets.css10
-rw-r--r--addons/website/static/src/css/snippets.sass12
-rw-r--r--addons/website/static/src/css/website.css9
-rw-r--r--addons/website/static/src/css/website.sass9
4 files changed, 34 insertions, 6 deletions
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index eb0b4d3e69b..7e8770d2033 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";
/* ---- Table Snippet ---- {{{ */
.table_desc {
margin: 0 0 20px 0;
@@ -148,3 +149,12 @@ table.table_desc tr td:last-child {
.s_features_grid {
margin-bottom: 16px;
}
+
+/* other snippet styles */
+.s_comparisons .panel .list-group-item:not(.active) {
+ color: #666;
+}
+
+.s_references .img-thumbnail {
+ border: none;
+}
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index cb18e21db53..78dd361a14d 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -122,3 +122,15 @@ table.table_desc tr td
.s_features_grid
margin-bottom: 16px
+
+
+/* other snippet styles */
+
+.s_comparisons
+ .panel
+ .list-group-item:not(.active)
+ color: #666
+
+.s_references
+ .img-thumbnail
+ border: none
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 32abb23c44d..e01ab6c4dea 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -120,6 +120,10 @@ hr {
font-size: 120%;
}
+.jumbotron.para_large p{
+ font-size: 150%;
+}
+
.readable {
font-size: 120%;
max-width: 700px;
@@ -262,7 +266,7 @@ ul.nav-stacked > li > a {
/* ---- SNIPPETS --- */
.oe_img_bg {
- background-size: 100%;
+ background-size: cover;
}
.carousel, .parallax, .blockquote {
@@ -547,8 +551,7 @@ div.carousel div.carousel-content {
/* Background (kept for 8.0 compatibility) */
.oe_dark {
- background: #eff8f8;
- background: rgba(200, 200, 200, 0.14);
+ background-color: rgba(200, 200, 200, 0.14);
}
.oe_black {
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index afaa0ded4f5..b4e4fd7805a 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -90,6 +90,10 @@ hr
.para_large
font-size: 120%
+.jumbotron.para_large p{
+ font-size: 150%;
+}
+
.readable
font-size: 120%
max-width: 700px
@@ -208,7 +212,7 @@ ul.nav-stacked > li > a
/* ---- SNIPPETS --- */
.oe_img_bg
- background-size: 100%
+ background-size: cover
.carousel, .parallax, .blockquote
overflow: hidden
@@ -447,8 +451,7 @@ div.carousel
/* Background (kept for 8.0 compatibility) */
.oe_dark
- background: #eff8f8
- background: rgba(200, 200, 200, 0.14)
+ background-color: rgba(200, 200, 200, 0.14)
.oe_black
background-color: rgba(0, 0, 0, 0.9)