From 4093259ec2f6a527b6beb4c784903cd4ff415d18 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 18:55:19 +0100
Subject: [PATCH 1/7] [WIP] website: fix css layout for themes
bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
---
.../static/src/css/bootswatch/amelia.fix.css | 21 +++++++++++++++++++
addons/website/views/themes.xml | 12 +++++++++++
.../static/src/css/website_sale.css | 5 ++---
.../static/src/css/website_sale.sass | 5 ++---
4 files changed, 37 insertions(+), 6 deletions(-)
create mode 100644 addons/website/static/src/css/bootswatch/amelia.fix.css
diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
new file mode 100644
index 00000000000..f724abcbfc9
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -0,0 +1,21 @@
+#website-top-navbar [data-action="cancel"] {
+ color: #ad1d28;
+}
+.oe_product section {
+ background: rgba(16, 138, 147, 0.75) !important;
+}
+.oe_product section .oe_subdescription {
+ color: #DFD6F5;
+}
+ul.wizard li {
+ background: #debb27 !important;
+}
+ul.wizard .chevron:before {
+ border-left: 10px solid #debb27 !important;
+}
+ul.wizard .text-primary {
+ color: #ad1d28 !important;
+}
+ul.wizard .text-success {
+ color: #ffffff !important;
+}
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index f56ab2b5dd7..9480c9bd30d 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -206,72 +206,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index d9880bd7025..6b09c973a73 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -54,10 +54,9 @@
bottom: 0;
overflow: hidden;
padding: 0 15px 24px 0;
- max-height: 110px;
min-height: 56px;
border-top: 1px solid rgba(255, 255, 255, 0.2);
- background: rgba(100, 100, 100, 0.1);
+ background: rgba(255, 255, 255, 0.75);
z-index: 5;
}
.oe_product .product_price {
@@ -74,7 +73,7 @@
font-size: 0.8em;
max-height: 42px;
overflow: hidden;
- margin-bottom: 30px;
+ margin-bottom: 10px;
}
.oe_mycart .input-group-addon {
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 7c5bde43509..28ca2f1eb88 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -48,10 +48,9 @@
bottom: 0
overflow: hidden
padding: 0 15px 24px 0
- max-height: 110px
min-height: 56px
border-top: 1px solid rgba(255,255,255,0.2)
- background: rgba(100, 100, 100, 0.1)
+ background: rgba(255, 255, 255, 0.75)
z-index: 5
.product_price
padding: 5px 0
@@ -65,7 +64,7 @@
font-size: 0.8em
max-height: 42px
overflow: hidden
- margin-bottom: 30px
+ margin-bottom: 10px
.oe_mycart
.input-group-addon
From caa33bbbbfe6f204e38b8894494fa3fd99ced286 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 11:21:19 +0100
Subject: [PATCH 2/7] [FIX] website: edit banner image
bzr revid: chm@openerp.com-20140313102119-nh6byvyeosqsosfn
---
addons/website/static/src/js/website.snippets.editor.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ee07840b12d..0607691ccaa 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1436,7 +1436,7 @@
this.$target.find('.carousel-control').off('click').on('click', function () {
self.$target.carousel( $(this).data('slide')); });
- this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
+ this.$target.find('.carousel-image, .carousel-inner .content > div').attr('contentEditable', 'true');
this.$target.find('.carousel-image').attr('attributeEditable', 'true');
this._super();
},
From e9fc839785259ca56542d112a6c1f032eab8e2b8 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 11:21:40 +0100
Subject: [PATCH 3/7] [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
From 8b94f855b69628937b1a9d45e5d3cf17d48b41ae Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 14:46:42 +0100
Subject: [PATCH 4/7] [FIX] website theme css
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
---
.../static/src/css/bootswatch/cyborg.fix.css | 18 ++++++++++++++++++
.../static/src/css/bootswatch/simplex.fix.css | 3 +++
.../static/src/css/bootswatch/slate.fix.css | 7 +++++++
.../static/src/css/bootswatch/yeti.fix.css | 3 +++
addons/website/views/themes.xml | 1 +
5 files changed, 32 insertions(+)
diff --git a/addons/website/static/src/css/bootswatch/cyborg.fix.css b/addons/website/static/src/css/bootswatch/cyborg.fix.css
index 43c8e5770f9..e93b2aa8ded 100644
--- a/addons/website/static/src/css/bootswatch/cyborg.fix.css
+++ b/addons/website/static/src/css/bootswatch/cyborg.fix.css
@@ -9,4 +9,22 @@ ul.wizard li {
}
ul.wizard .chevron:before {
border-left: 10px solid #222 !important;
+}
+.popover, .modal-content {
+ border: 1px solid rgba(200,200,200,0.5);
+}
+.close {
+ color: #fff;
+}
+.popover.bottom .arrow:after {
+ border-bottom-color: #333;
+}
+.popover.top .arrow:after {
+ border-top-color: #333;
+}
+.popover.left .arrow:after {
+ border-left-color: #333;
+}
+.popover.right .arrow:after {
+ border-right-color: #333;
}
\ 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
index c87f0de237b..5d1df525449 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,3 +1,6 @@
#website-top-navbar [data-action="cancel"] {
color: #fff;
+}
+.fa {
+ font-family: FontAwesome !important;
}
\ 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
index a61f8d98338..c2e1a999b03 100644
--- a/addons/website/static/src/css/bootswatch/slate.fix.css
+++ b/addons/website/static/src/css/bootswatch/slate.fix.css
@@ -12,3 +12,10 @@ ul.wizard .chevron:before {
ul.wizard li.text-primary {
color: #fff;
}
+.close {
+ color: #fff;
+}
+.popover {
+ -webkit-box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+ box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+}
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
index c87f0de237b..a2835886465 100644
--- a/addons/website/static/src/css/bootswatch/yeti.fix.css
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -1,3 +1,6 @@
#website-top-navbar [data-action="cancel"] {
color: #fff;
+}
+.popover .close {
+ color: #fff;
}
\ No newline at end of file
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 1b1cf1fe4d3..82f5105adcd 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -268,6 +268,7 @@
+
From 62f0b963afb10ad51c8959b1ef8996f7ffb57f18 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 15:19:10 +0100
Subject: [PATCH 5/7] [ADD] missing css file
bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
---
addons/website/static/src/css/bootswatch/spacelab.fix.css | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 addons/website/static/src/css/bootswatch/spacelab.fix.css
diff --git a/addons/website/static/src/css/bootswatch/spacelab.fix.css b/addons/website/static/src/css/bootswatch/spacelab.fix.css
new file mode 100644
index 00000000000..6d01e9a2485
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/spacelab.fix.css
@@ -0,0 +1,8 @@
+.carousel .carousel-caption.content,
+.carousel .carousel-caption.content h1,
+.carousel .carousel-caption.content h2,
+.carousel .carousel-caption.content h3,
+.carousel .carousel-caption.content h4,
+.carousel .carousel-caption.content h5 {
+ color: #ccc;
+}
\ No newline at end of file
From 10af6ef1689b4cccf05d0a35cda10bb7f7d3437d Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 15:22:44 +0100
Subject: [PATCH 6/7] [rev] website: remove js fix from this branch
bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
---
addons/website/static/src/js/website.snippets.editor.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 0607691ccaa..ee07840b12d 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1436,7 +1436,7 @@
this.$target.find('.carousel-control').off('click').on('click', function () {
self.$target.carousel( $(this).data('slide')); });
- this.$target.find('.carousel-image, .carousel-inner .content > div').attr('contentEditable', 'true');
+ this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
this.$target.find('.carousel-image').attr('attributeEditable', 'true');
this._super();
},
From 264186541b44d3fe4ec15aa4bc155e24d3e56179 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 16:04:46 +0100
Subject: [PATCH 7/7] [IMP] website: remove css .fa and write important in font
fa in web branch
bzr revid: chm@openerp.com-20140314150446-9g4n4ixws4cedfxp
---
addons/website/static/src/css/bootswatch/simplex.fix.css | 3 ---
1 file changed, 3 deletions(-)
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
index 5d1df525449..c87f0de237b 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,6 +1,3 @@
#website-top-navbar [data-action="cancel"] {
color: #fff;
-}
-.fa {
- font-family: FontAwesome !important;
}
\ No newline at end of file