merged with master

app.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Thu Jan 01 2015 08:35:15 GMT+0100 (CET)
+# Time: Fri Jan 02 2015 17:10:28 GMT+0100 (CET)
 
 
 CACHE:

css/desktop.css

@@ -4,7 +4,7 @@
   max-width: 1010px;
   margin: 0 auto;
   height: 48px;
-  background: #517b9b;
+  background: #5682a3;
 }
 .tg_head_logo_wrap {
   float: left;
@@ -28,7 +28,7 @@
 .tg_head_btn:hover {
   color: #FFF;
   text-decoration: none;
-  background: #3f6c8c;
+  background: #497799;
 }
 
 .tg_head_logo_dropdown .dropdown-toggle {
@@ -237,6 +237,7 @@
   font-size: 13px;
   line-height: 20px;
   float: left;
+  font-weight: bold;
 }
 .icon-filter-photos,
 .icon-filter-video,
@@ -534,17 +535,17 @@ a.footer_link.active:active {
 .im_history_typing_wrap {
   line-height: 18px;
   width: 100%;
-  height: 49px;
+  height: 39px;
-  padding: 13px 0 18px;
+  padding: 13px 0 8px;
   overflow: hidden;
   -webkit-user-select: none;
 }
 .im_history_typing {
   font-size: 11px;
   color: #999;
-  max-width: 526px;
+  max-width: 556px;
   margin: 0 auto;
-  padding: 0 77px 0 71px;
+  padding: 0 81px 0 85px;
 }
 .im_history_typing a.im_history_typing_author {
   color: #999;
@@ -606,9 +607,14 @@ a.footer_link.active:active {
 }
 
 .im_edit_panel_wrap {
-  padding: 15px 0 38px;
+  padding: 0px 0 38px;
   margin: 0 24px 0 12px;
 }
+.im_edit_panel_border {
+  display: block;
+  margin: 0 0 49px 3px;
+  border-bottom: 1px solid #EEE;
+}
 .im_edit_flush_link,
 .im_edit_cancel_link {
   display: block;
@@ -635,6 +641,8 @@ a.footer_link.active:active {
   border-radius: 0;
   float: right;
   min-width: 0;
+  margin-top: 5px;
+  margin-left: 10px;
   width: auto;
   padding: 0;
   font-weight: bold;
@@ -644,6 +652,26 @@ a.footer_link.active:active {
   background: inherit;
 }
 
+.im_emoji_quick_select_area {
+  display: block;
+  height: 30px;
+  overflow: hidden;
+  max-width: 210px;
+}
+
+.im_emoji_quick_select_area a {
+  display: inline-block;
+  padding: 5px;
+  outline: 0;
+}
+
+.im_emoji_quick_select_area a:hover {
+  background-color: #edf2f5;
+}
+.im_emoji_quick_select_area a .label {
+  display: none;
+}
+
 .im_message_selected .im_message_date,
 .im_message_selected .im_message_document_size,
 .im_message_selected .im_message_audio_duration,
@@ -795,6 +823,7 @@ a.footer_link.active:active {
 
 .im_send_panel_wrap {
   max-width: 554px;
+  padding-bottom: 23px;
 }
 .im_send_form {
   max-width: 382px;
@@ -807,7 +836,7 @@ a.footer_link.active:active {
   width: 52px;
   height: 52px;
   line-height: 52px;
-  border-radius: 24px;
+  border-radius: 50%;
   overflow: hidden;
 }
 div.im_panel_peer_photo,
@@ -873,7 +902,7 @@ a.im_panel_peer_photo .peer_initials {
 }
 
 .im_send_field_wrap {
-  margin-bottom: 20px;
+  margin-bottom: 15px;
 }
 .emoji-wysiwyg-editor,
 .im_message_field {
@@ -904,7 +933,7 @@ a.im_panel_peer_photo .peer_initials {
   width: 18px;
   height: 17px;
   margin-right: 28px;
-  margin-top: 1px;
+  margin-top: 6px;
 }
 
 .icon-paperclip {
@@ -938,6 +967,8 @@ a.im_panel_peer_photo .peer_initials {
 
   width: 20px;
   height: 18px;
+  margin-top: 5px;
+  margin-right: 25px;
 }
 
 
@@ -1272,6 +1303,9 @@ a.im_panel_peer_photo .peer_initials {
 .im_grouped_short .im_content_message_wrap {
   margin: 6px 10px 6px 16px
 }
+.im_grouped_short:last-child .im_content_message_wrap {
+  margin-bottom: 8px;
+}
 @media (min-width: 901px) {
   .im_message_wrap {
     position: relative;

css/mobile.css

@@ -29,6 +29,7 @@ html {
   margin: 0;
 }
 .tg_page_head .navbar-inverse {
+  background: #5682a3;
   border: 0;
 
   -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.11);
@@ -211,12 +212,15 @@ html {
 .tg_page_head .navbar > .container .navbar-brand {
   display: none;
 }
-.tg_page_head .navbar {
-  min-height: 46px;
-}
 .tg_page_head .navbar_peer_not_selected > .container .navbar-brand {
   display: block;
 }
+.tg_page_head .navbar_offline > .container .navbar-brand.tg_logo_wrap {
+  display: none;
+}
+.tg_page_head .navbar {
+  min-height: 46px;
+}
 
 .tg_page_head .navbar-inverse .navbar-quick-nav > li > a {
   padding-left: 16px;
@@ -277,16 +281,12 @@ html {
   float: left;
   margin: 0;
 }
-.navbar_offline .tg_logo_wrap {
-  display: none;
-}
 .navbar-offline > li > a {
   padding-right: 0;
   padding-left: 0;
 }
 .navbar-offline-text {
   color: #FFF;
-  padding-left: 0px;
   font-size: 15px;
 }
 .tg_page_head .navbar-inverse .navbar-offline > li > a {

js/locales/en-us.json

@@ -187,6 +187,7 @@
 	"conversation_media_photo": "Photo",
 	"conversation_media_video": "Video",
 	"conversation_media_document": "Document",
+	"conversation_media_sticker": "Sticker",
 	"conversation_media_audio": "Audio",
 	"conversation_media_location": "Location",
 	"conversation_media_contact": "Contact",

webogram.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Thu Jan 01 2015 08:35:15 GMT+0100 (CET)
+# Time: Fri Jan 02 2015 17:10:28 GMT+0100 (CET)
 
 
 CACHE: