From 2569e07191422bbd3535ded11825425de4247dd1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 12:39:46 +0100
Subject: [IMP] website: snippet don't use snipet id

bzr revid: chm@openerp.com-20140303113946-d70yd8nmew1k3z37
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.editor.xml')

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 6c1e387c958..8caac7c6683 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -97,7 +97,7 @@
                       target="fileframe"
                       class="col-sm-8">
                     <div class="text-center">
-                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
                         <button type="button" class="btn btn-primary btn-lg filepicker">
                             Upload an image from your computer
                         </button>
-- 
cgit v1.2.3


From f9579073fe29361e677615b59f0adcc9cef6be26 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 18 Mar 2014 12:14:42 +0100
Subject: [FIX] website: color of Edit Master link for themes. CSS less
 specific

bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.editor.xml')

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 1010ec05127..37cdcf786b5 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -6,7 +6,7 @@
                     <button type="button" data-action="save"
                             class="btn btn-primary">Save</button>
                     or
-                    <a href="#" data-action="cancel">Discard</a>
+                    <a href="#" data-action="cancel" class="btn btn-link">Discard</a>
                 </form>
                 <ul class="nav navbar-nav pull-right">
                 </ul>
-- 
cgit v1.2.3