summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorHitesh Trivedi <htr@openerp.com>2015-02-17 13:19:53 +0100
committerJérome Maes <jem@openerp.com>2015-03-17 09:09:27 +0100
commitf2987ea4126e7b7c27121bccf2aab3a60b229eb3 (patch)
tree84f51892bd1a3aecbb9497bd6d352c773496cf34 /addons/website/static/src
parent5b9276bf29f0ec0173cfc0172188584418900b51 (diff)
[IMP] website_blog : onboarding. The cover image of a blog post is editable (opacity, color, size, ...). Add a new tour, views improvements and new default images
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/css/editor.css6
-rw-r--r--addons/website/static/src/css/editor.sass4
-rw-r--r--addons/website/static/src/css/website.css12
-rw-r--r--addons/website/static/src/css/website.sass9
-rw-r--r--addons/website/static/src/js/website.contentMenu.js5
5 files changed, 34 insertions, 2 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 8ec49889863..f1d77acdc0d 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -85,7 +85,11 @@
.editor_enable [data-oe-readonly]:hover {
cursor: default;
}
-
+/* Summernote not Support for placeholder text https://github.com/summernote/summernote/issues/581 */
+.o_editable[placeholder]:empty:not(:focus):before {
+ content: attr(placeholder);
+ opacity: 0.3;
+}
/* Prevent the text contents of draggable elements from being selectable. */
[draggable] {
-moz-user-select: none;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 9110b4454cd..73c000f737a 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -78,6 +78,10 @@
cursor: default
// }}}
+/* Summernote not Support for placeholder text https://github.com/summernote/summernote/issues/581 */
+.o_editable[placeholder]:empty:not(:focus):before
+ content: attr(placeholder)
+ opacity: 0.3
/* Prevent the text contents of draggable elements from being selectable. */
[draggable]
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 473ea32f268..faba9afc267 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -768,6 +768,18 @@ div.carousel div.carousel-content {
color: #ddd;
}
+.oe_none {
+ background-color: #FFFFFF;
+}
+
+.oe_yellow {
+ background-color: #A2A51B;
+}
+
+.oe_green {
+ background-color: #149F2C;
+}
+
/* Misc */
.texttop {
vertical-align: top;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 85259178e15..45215c1cb3e 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -603,6 +603,15 @@ div.carousel
.text-muted
color: #ddd
+.oe_none
+ background-color: #FFFFFF
+
+.oe_yellow
+ background-color: #A2A51B
+
+.oe_green
+ background-color: #149F2C
+
/* Misc */
.texttop
diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js
index ab85c061a12..bb91540b0b4 100644
--- a/addons/website/static/src/js/website.contentMenu.js
+++ b/addons/website/static/src/js/website.contentMenu.js
@@ -12,7 +12,10 @@
self.$el.on('click', 'a[data-action]', function(ev) {
ev.preventDefault();
var $content_item = $(this);
- self[$content_item.data('action')]();
+ var data_action = self[$content_item.data('action')];
+ if (data_action) {
+ data_action();
+ }
});
return this._super();
},