diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-04-11 15:40:52 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-04-11 15:40:52 +0200 |
| commit | e51049e8edcf34bfbbdf060145acffc82dc18a62 (patch) | |
| tree | b58244aa2b6ce7804c28d8f0b5ad3eba49cccbb8 /addons/website/static/src | |
| parent | cd4afee17e77d5d5de8dc27f7dbe56be6d8fe7a2 (diff) | |
| parent | d04ee666ccb0c35bd1c13d9814fdb52f1159e7e9 (diff) | |
[MERGE] Sync with upstream
bzr revid: tde@openerp.com-20140411134052-x74otuwuxoz20qab
Diffstat (limited to 'addons/website/static/src')
4 files changed, 13 insertions, 4 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 9339b5e03b9..91cee76248f 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY * * css for editor buttons, openerp widget included in the website and other @@ -108,6 +107,10 @@ header a.navbar-brand img { } /* ----- Snippets Styles ----- */ +.para_large { + font-size: 120%; +} + .readable { font-size: 120%; max-width: 700px; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index e8a7d870623..e3c6bd7a052 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -76,6 +76,9 @@ header /* ----- Snippets Styles ----- */ +.para_large + font-size: 120% + .readable font-size: 120% max-width: 700px diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js index 1b8dfc0b320..c72e2c3b84e 100644 --- a/addons/website/static/src/js/website.snippets.animation.js +++ b/addons/website/static/src/js/website.snippets.animation.js @@ -34,7 +34,6 @@ var $snipped_id = $(this); if ($snipped_id.data("snippet-view")) { $snipped_id.data("snippet-view").stop(); - $snipped_id.data("snippet-view", false); } }); }; diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index fac4f9ab357..d8eee3cbec5 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -151,10 +151,11 @@ $("[data-oe-model] *, [data-oe-type=html] *").off('click'); window.snippets = this.snippets = new website.snippet.BuildingBlock(this); this.snippets.appendTo(this.$el); + website.snippet.stop_animation(); this.on('rte:ready', this, function () { self.snippets.$button.removeClass("hidden"); - website.snippet.stop_animation(); - website.snippet.start_animation(true, $(".media_iframe_video")); + website.snippet.start_animation(); + $("#wrapwrap *").off('mousedown mouseup click'); }); return this._super.apply(this, arguments); @@ -1399,6 +1400,9 @@ start : function () { var self = this; this._super(); + if (!self.$target.data("snippet-view")) { + this.$target.data("snippet-view", new website.snippet.animationRegistry.parallax(this.$target)); + } this.scroll(); this.$target.on('snippet-style-change snippet-style-preview', function () { self.$target.data("snippet-view").set_values(); |