merged with master

10 years ago · d314058439
6 changed files with 10 additions and 6 deletions
--- a/.swp
+++ b/.swp
--- a/app.manifest
+++ b/app.manifest
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Tue Mar 24 2015 22:46:10 GMT+0300 (MSK)
+# Time: Wed Mar 25 2015 19:12:59 GMT+0300 (MSK)


 CACHE:
--- a/css/app.css
+++ b/css/app.css
@ -1285,7 +1285,7 @@ a.tg_radio_on:hover i.icon-radio{background-color:#5785aa}
 .im_dialogs_import_phonebook{margin-top:10px}
 .im_dialogs_panel{padding:12px 12px 6px;position:relative}
 .im_dialogs_search{position:relative}
-.im_dialogs_search_field{font-size:12px;line-height:normal;border:1px solid #F2F2F2;border-radius:2px;padding:6px 20px 6px 30px;margin:0 0 6px;background-image:url(../img/icons/IconsetW.png);background-repeat:no-repeat;background-position:-6px -205px}
+.im_dialogs_search_field{font-size:12px;line-height:normal;border:1px solid #F2F2F2;border-radius:2px;padding:6px 20px 6px 30px;margin:0 0 6px;background-color:#F2F2F2;background-image:url(../img/icons/IconsetW.png);background-repeat:no-repeat;background-position:-6px -205px}
 .is_2x .im_dialogs_search_field{background-image:url(../img/icons/IconsetW_2x.png);background-size:42px 1171px}
 .im_dialogs_modal_col_wrap .im_dialogs_search_field{background-color:#fff;border-color:#d9dbde}
 .im_dialogs_search_field:active,.im_dialogs_search_field:focus{background-color:#fff}
--- a/css/desktop.css
+++ b/css/desktop.css
@ -1160,6 +1160,10 @@ a.im_panel_peer_photo .peer_initials {
  .im_edit_panel_border {
    margin-bottom: 7px;
  }
+  .im_send_dropbox_wrap {
+    padding-top: 5px;
+    padding-bottom: 5px;
+  }
 }
 /* Peer modals */
 .user_modal_window .modal-dialog {
--- a/js/app.js
+++ b/js/app.js
--- a/webogram.appcache
+++ b/webogram.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Tue Mar 24 2015 22:46:10 GMT+0300 (MSK)
+# Time: Wed Mar 25 2015 19:12:59 GMT+0300 (MSK)


 CACHE: