From 67c1e91728ae89730dc15dfe150099be97be9997 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Fri, 31 Jan 2014 15:26:52 +0400
Subject: [PATCH] merged with master

---
 css/app.css | 2 +-
 index.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/app.css b/css/app.css
index 340ecb8d..0dceacfc 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1188,7 +1188,7 @@ img.img_fullsize {
 }
 .emoji-wysiwyg-editor:active:before,
 .emoji-wysiwyg-editor:focus:before {
-  content: '' !important;
+  content: none;
 }
 
 .emoji-wysiwyg-editor {
diff --git a/index.html b/index.html
index 839edd03..6218ea59 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="vendor/angular/angular-csp.css"/>
   <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.css"/>
   <link rel="stylesheet" href="vendor/jquery.nanoscroller/nanoscroller.css"/>
-  <link rel="stylesheet" href="css/app.css?11"/>
+  <link rel="stylesheet" href="css/app.css?12"/>
   <link rel="icon" href="favicon.ico" type="image/x-icon" />
 
   <meta property="og:title" content="Webogram">