From f6eb40fc90802526161d051ddef7dd1582324f16 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Dec 2013 11:47:02 +0100
Subject: [PATCH] [FIX] enable user-selection on editable buttons (when the
 button itself is editable, not just in an editable section)

bzr revid: xmo@openerp.com-20131217104702-jell0imowvzjlasl
---
 addons/website/static/src/css/editor.css  | 3 +--
 addons/website/static/src/css/editor.sass | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index af5519cae2c..e40d6996850 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 /* ---- CKEditor Minimal Reset ---- */
 .navbar.navbar-inverse .cke_chrome {
   border: none;
@@ -173,7 +172,7 @@ ul.oe_menu_editor .disclose {
 }
 
 /* ---- RTE ---- */
-.oe_editable .btn {
+.oe_editable .btn, .btn.oe_editable {
   -webkit-user-select: auto;
   -moz-user-select: auto;
   user-select: auto;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c2bc7a43dfa..38b1d9f3436 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -141,8 +141,8 @@ ul.oe_menu_editor
 
 // bootstrap makes .btn elements unselectable -> RTE double-click can't know
 // about them either
-.oe_editable .btn
-    @include user-select(auto)
+.oe_editable .btn, .btn.oe_editable
+    +user-select(auto)
 
 .modal-dialog.select-image
     width: 80%