diff options
| author | Jeremy Kersten <jke@odoo.com> | 2015-08-29 12:15:55 +0200 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2015-08-29 12:16:48 +0200 |
| commit | b86d98de248ffd04b5749b4ab04413c514f7a22e (patch) | |
| tree | c94ef6aa3c75193d717c593a9ab0d9abc901b1cf /addons/website/static/src | |
| parent | 7a768a495168e9b74c7f6b768aa9a975601501be (diff) | |
[IMP] website: imp snippet bar
Force fa size to 14px, to avoid that themes which change body size,
change the fa snippet icon size and display it on severals lines.
Add text 'Snippets are loading' while snippets template is downloading.
Diffstat (limited to 'addons/website/static/src')
4 files changed, 12 insertions, 2 deletions
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 6f7ec863677..942629dbcc7 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -9,6 +9,10 @@ -moz-box-shadow: 0px 10px 10px -10px black inset; -webkit-box-shadow: 0px 10px 10px -10px black inset; box-shadow: 0px 10px 10px -10px black inset; + font-size: 14px; +} +#oe_snippets #o_left_bar .snippets_loading, #oe_snippets #o_arrow .snippets_loading { + color: white; } #oe_snippets #o_arrow { z-index: 1009; diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass index 7e33c14fd44..0c162018438 100644 --- a/addons/website/static/src/css/snippets.sass +++ b/addons/website/static/src/css/snippets.sass @@ -13,6 +13,10 @@ bottom: 0 background: rgb(40,40,40) +box-shadow(0px 10px 10px -10px black inset) + font-size: 14px + .snippets_loading + color: white + #o_arrow z-index: 1009 width: 24px diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index e45feeb590c..6fbfbaa9401 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -313,7 +313,7 @@ $html.find('.o_not_editable').attr("contentEditable", false); - $left_bar.append($html); + $left_bar.html($html); // animate for list of snippet blocks $left_bar.on('click', '.scroll-link', function (event) { diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index 42a925184fa..63d5afc2e5b 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -20,7 +20,9 @@ <div>Insert Blocks</div> <span class="fa fa-angle-double-right fa-1x" style="bottom: 10px;"></span> </div> - <div id="o_left_bar"></div> + <div id="o_left_bar"> + <span class='snippets_loading'>Snippets are loading...</span> + </div> </div> </t> |