From e9fc839785259ca56542d112a6c1f032eab8e2b8 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 11:21:40 +0100
Subject: [PATCH] [FIX] website: css themes
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
---
.../static/src/css/bootswatch/amelia.fix.css | 8 +++++++-
.../static/src/css/bootswatch/cosmo.fix.css | 7 +++++++
.../static/src/css/bootswatch/cyborg.fix.css | 12 ++++++++++++
.../static/src/css/bootswatch/flatly.fix.css | 3 +++
.../static/src/css/bootswatch/journal.fix.css | 6 ++++++
.../static/src/css/bootswatch/readable.fix.css | 3 +++
.../static/src/css/bootswatch/simplex.fix.css | 3 +++
.../static/src/css/bootswatch/slate.fix.css | 14 ++++++++++++++
.../website/static/src/css/bootswatch/yeti.fix.css | 3 +++
addons/website/static/src/css/website.css | 1 +
addons/website/static/src/css/website.sass | 1 +
addons/website/views/themes.xml | 5 +----
.../website_sale/static/src/css/website_sale.css | 1 -
.../website_sale/static/src/css/website_sale.sass | 1 -
14 files changed, 61 insertions(+), 7 deletions(-)
create mode 100644 addons/website/static/src/css/bootswatch/cosmo.fix.css
create mode 100644 addons/website/static/src/css/bootswatch/cyborg.fix.css
create mode 100644 addons/website/static/src/css/bootswatch/flatly.fix.css
create mode 100644 addons/website/static/src/css/bootswatch/journal.fix.css
create mode 100644 addons/website/static/src/css/bootswatch/readable.fix.css
create mode 100644 addons/website/static/src/css/bootswatch/simplex.fix.css
create mode 100644 addons/website/static/src/css/bootswatch/slate.fix.css
create mode 100644 addons/website/static/src/css/bootswatch/yeti.fix.css
diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
index f724abcbfc9..38d71852a0a 100644
--- a/addons/website/static/src/css/bootswatch/amelia.fix.css
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -4,7 +4,7 @@
.oe_product section {
background: rgba(16, 138, 147, 0.75) !important;
}
-.oe_product section .oe_subdescription {
+.oe_product section .text-info {
color: #DFD6F5;
}
ul.wizard li {
@@ -19,3 +19,9 @@ ul.wizard .text-primary {
ul.wizard .text-success {
color: #ffffff !important;
}
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before {
+ color: #79D5DB !important;
+}
+.input-group-addon .fa {
+ color: #444;
+}
diff --git a/addons/website/static/src/css/bootswatch/cosmo.fix.css b/addons/website/static/src/css/bootswatch/cosmo.fix.css
new file mode 100644
index 00000000000..5801cc0d7a4
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/cosmo.fix.css
@@ -0,0 +1,7 @@
+#website-top-navbar button.btn-primary {
+ color: #fff;
+ border: 2px solid #0061c2;
+}
+#website-top-navbar [data-action="cancel"] {
+ color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/cyborg.fix.css b/addons/website/static/src/css/bootswatch/cyborg.fix.css
new file mode 100644
index 00000000000..43c8e5770f9
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/cyborg.fix.css
@@ -0,0 +1,12 @@
+.oe_product section {
+ background: rgba(40, 40, 40, 0.85) !important;
+}
+.oe_product section .text-info {
+ color: #BA66E4;
+}
+ul.wizard li {
+ background: #222 !important;
+}
+ul.wizard .chevron:before {
+ border-left: 10px solid #222 !important;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/flatly.fix.css b/addons/website/static/src/css/bootswatch/flatly.fix.css
new file mode 100644
index 00000000000..fe4a2e73ed1
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/flatly.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+ color: #2c3e50;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/journal.fix.css b/addons/website/static/src/css/bootswatch/journal.fix.css
new file mode 100644
index 00000000000..a7f93fa312f
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/journal.fix.css
@@ -0,0 +1,6 @@
+#website-top-navbar button.btn-primary {
+ border: 2px solid #e4332e;
+}
+#website-top-navbar [data-action="cancel"] {
+ color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/readable.fix.css b/addons/website/static/src/css/bootswatch/readable.fix.css
new file mode 100644
index 00000000000..8e22d318615
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/readable.fix.css
@@ -0,0 +1,3 @@
+.oe_product section .text-info {
+ color: #2A9CBE;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
new file mode 100644
index 00000000000..c87f0de237b
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+ color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/slate.fix.css b/addons/website/static/src/css/bootswatch/slate.fix.css
new file mode 100644
index 00000000000..a61f8d98338
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/slate.fix.css
@@ -0,0 +1,14 @@
+.oe_product section {
+ background: rgba(40, 40, 45, 0.80) !important;
+}
+ul.wizard li {
+ background-image: -webkit-linear-gradient(#8a9196,#7a8288 60%,#788084) !important;
+ background-image: linear-gradient(#8a9196,#7a8288 60%,#788084 ) !important;
+ color: #ccc;
+}
+ul.wizard .chevron:before {
+ border-left: 10px solid #7C8386 !important;
+}
+ul.wizard li.text-primary {
+ color: #fff;
+}
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
new file mode 100644
index 00000000000..c87f0de237b
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+ color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 81b40ce7aca..6f69f554bd1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -120,6 +120,7 @@ header a.navbar-brand img {
.container .container {
padding-left: 0;
padding-right: 0;
+ width: 100%;
}
/* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index a9ae82cee3a..200401023a6 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
.container
padding-left: 0
padding-right: 0
+ width: 100%
/* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 9480c9bd30d..1b1cf1fe4d3 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -213,7 +213,6 @@
-
@@ -269,21 +268,19 @@
-
-
-
+
diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 6b09c973a73..3e5e692304e 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -71,7 +71,6 @@
}
.oe_product .oe_subdescription {
font-size: 0.8em;
- max-height: 42px;
overflow: hidden;
margin-bottom: 10px;
}
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 28ca2f1eb88..128b1a25d43 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -62,7 +62,6 @@
height: 100%
.oe_subdescription
font-size: 0.8em
- max-height: 42px
overflow: hidden
margin-bottom: 10px