From 5c521a72ca16566824d1f2cfc966f08a178053e1 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Fri, 25 Jul 2014 18:54:23 +0400 Subject: [PATCH] Final fixes --- app/css/app.css | 2 +- app/css/app_mobile.css | 31 +++++++++++++++++++++--------- app/img/iphone_home120.png | Bin 0 -> 3682 bytes app/img/iphone_startup.png | Bin 0 -> 1951 bytes app/index.html | 11 ++++++----- app/js/directives.js | 32 +++++++++++++++++++++++-------- app/partials/chat_modal.html | 2 +- app/partials/contacts_modal.html | 12 ++---------- app/partials/head.html | 10 +++++----- app/partials/im.html | 4 ++-- app/partials/peer_select.html | 2 +- app/partials/settings_modal.html | 2 +- app/partials/user_modal.html | 2 +- app/webogram.appcache | 2 +- 14 files changed, 67 insertions(+), 45 deletions(-) create mode 100644 app/img/iphone_home120.png create mode 100644 app/img/iphone_startup.png diff --git a/app/css/app.css b/app/css/app.css index 9ca0d4b0..8f69c1c2 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -2129,7 +2129,7 @@ div.im_panel_own_photo { margin-top: -7px; margin-left: 43px; } -.status_online { +.icon-online { background: #6DBF69; border: 1px solid #FFF; display: block; diff --git a/app/css/app_mobile.css b/app/css/app_mobile.css index 85ca2f50..bb87412c 100644 --- a/app/css/app_mobile.css +++ b/app/css/app_mobile.css @@ -181,14 +181,21 @@ html { .navbar-quick-media-back h4 { margin: 9px 0 12px 0; } +.navbar-quick-profile-back h4, +.navbar-quick-group-back h4 { + font-weight: bold; +} .navbar-quick-profile-back small, .navbar-quick-group-back small { - font-size: 12px; - color: #FFF; + font-size: 13px; white-space: nowrap; overflow: hidden; margin-left: 0; } +.navbar-quick-profile-back .status_online, +.navbar-quick-group-back .status_online { + color: #FFF; +} .navbar-menu { display: none; @@ -499,7 +506,7 @@ a.im_message_video_thumb { padding: 0 8px; } .im_content_message_wrap { - font-size: 1.2em; + font-size: 15px; float: left; position: relative; max-width: 80%; @@ -795,6 +802,7 @@ a.im_message_from_photo { border-radius: 0 !important; padding-right: 11px; } + .im_dialog_wrap:last-child a.im_dialog { border-bottom: 0; } @@ -807,20 +815,20 @@ a.im_message_from_photo { .im_dialog_peer, .im_dialog_message { - font-size: 1.2em; + font-size: 1.3em; } .im_dialog_peer { margin-bottom: 7px; margin-top: 5px; } .im_dialog_meta { - margin-top: 5px; + margin-top: 6px; } .im_dialog_date, a.im_dialog:hover .im_dialog_date, a.im_dialog_selected .im_dialog_date { color: #b3b3b3; - font-size: 13px; + font-size: 12px; margin-right: 3px; } .im_dialog_badge { @@ -837,7 +845,9 @@ a.im_dialog:hover .im_dialog_unread, a.im_dialog_selected .im_dialog_unread { background: #7cacc7; } -.im_dialog_message_text { +.im_dialog_message_text, +a.im_dialog:hover .im_dialog_message_text, +a.im_dialog_selected .im_dialog_message_text { color: #8f8f8f; } @@ -1011,7 +1021,7 @@ a.im_message_fwd_author { vertical-align: text-top; background: url(../img/icons/IconsetW.png) -12px -68px no-repeat; background-size: 42px 891px; - opacity: 1; + opacity: 0.8; } .is_1x .icon-camera { background-image: url(../img/icons/IconsetW_1x.png); @@ -1071,11 +1081,14 @@ a.im_message_fwd_author { min-height: 32px; max-height: 150px; margin-bottom: 0; + font-size: 15px; } .emoji-wysiwyg-editor:empty { background: #f1f1f1; border-color: #f1f1f1; - content: attr(placeholder); +} +.emoji-wysiwyg-editor:empty:before { + color: #999; } .emoji-wysiwyg-editor:active, .emoji-wysiwyg-editor:focus { diff --git a/app/img/iphone_home120.png b/app/img/iphone_home120.png new file mode 100644 index 0000000000000000000000000000000000000000..50ab80d6a275b80e6310547b357165b17e5ad525 GIT binary patch literal 3682 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 literal 0 HcmV?d00001 diff --git a/app/img/iphone_startup.png b/app/img/iphone_startup.png new file mode 100644 index 0000000000000000000000000000000000000000..0aa1abf0129d8d4776e933409ea94ca19750e619 GIT binary patch literal 1951 zcmb_dO=#0#7*4k#+jKY>;@l}q!Hc%}(q9@@*R<(e#mw22SrBAd@^uYceoVgEv>;B! zgC|8q5J3fzc~Lxh@!&2yc=Y1IlLwFforDR3U)rYKv>9|7cuBsG=Y8JiecuOib9UzB z(BRl0K@dZ^X+BR7z7&p+{XO{R{8#@7ejP#CBAU}ns3Mw>;ADLfk~vjef_W&))r)W8 z1VQvtN}-5~!f960)u8BLg0^blY=W4Wv<*>OhKO8*ONy4HzP)}!k&2w8&P4?v7#Ubr zrfVjgtIZUo+Om|8smT-Mgw0|C6(W(e)fLTR?Icy_W%0LjO;cnYf|iq1LsU_iB{RAS z$!HJ+BoG5+j0rN~NIV`tPKE#jXb_^AP=JZE;SdV|*?cHm&6G=Qo}X&g!lxuvM#x}k zx>BhGE8(DSF40UPk#IOdp#Vk%tg41YJD^#9mw|_tWGV(ybd7Wv#YKG;B`K`5(SmBU zXf>-jCOk0O77dyS0;eSxC zWlwJ zPrhcZ?5!o@nM-3aw6oZ4i*~QDdz{afZSkRHe5hf!o7mPrAB_JZh`x~=&lT(spWnY5 zSOdd6=U@Nw^x@q*^G}Rdx6d3bohsTdpWmty(aqY0W2v+21F4O*HJ|S~j^3VqeFvQA zA9Z3FkPA*Y0Im~g80-T2v3dE%p~uhe-Jd58kL{5P3)(KKb3G4GYGb?dHYn!XMYP*~ zSCw|os9mW(NSDb&jyvgwrmjG(oi#?}GPyfzbl)AwZGY$X|6uA2+KWY8CU-{vGRTH) zU8b%E$!#1Z{=3cgzI>0B?R1C-=l{qFoSbJ-dGMS9`dZ+^(? A8UO$Q literal 0 HcmV?d00001 diff --git a/app/index.html b/app/index.html index 91d41db2..503713d9 100644 --- a/app/index.html +++ b/app/index.html @@ -2,7 +2,7 @@ - + Webogram @@ -15,15 +15,16 @@ - - - + + + - + + diff --git a/app/js/directives.js b/app/js/directives.js index 6196c647..563b1c61 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1584,7 +1584,7 @@ angular.module('myApp.directives', ['myApp.filters']) } }) - .directive('myUserStatus', function ($filter, AppUsersManager) { + .directive('myUserStatus', function ($filter, $rootScope, AppUsersManager) { var statusFilter = $filter('userStatus'); @@ -1593,10 +1593,24 @@ angular.module('myApp.directives', ['myApp.filters']) }; function link($scope, element, attrs) { - var userID = $scope.$eval(attrs.myUserStatus), - user = AppUsersManager.getUser(userID); + var userID, + update = function () { + var user = AppUsersManager.getUser(userID); + element + .html(statusFilter(user)) + .toggleClass('status_online', user.status && user.status._ == 'userStatusOnline'); + }; - element.html(statusFilter(user)); + $scope.$watch(attrs.myUserStatus, function (newUserID) { + console.log(attrs.myUserStatus, newUserID); + userID = newUserID; + update(); + }); + $rootScope.$on('user_update', function (e, updUserID) { + if (userID == updUserID) { + update(); + } + }); } }) @@ -1608,7 +1622,7 @@ angular.module('myApp.directives', ['myApp.filters']) scope: { userID: '=myUserPhotolink' }, - template: '' + template: '' }; function link($scope, element, attrs) { @@ -1618,9 +1632,11 @@ angular.module('myApp.directives', ['myApp.filters']) $scope.user = AppUsersManager.getUser($scope.userID); } - element.on('click', function (e) { - $rootScope.openUser($scope.userID); - }); + if (element[0].tagName == 'A') { + element.on('click', function (e) { + $rootScope.openUser($scope.userID); + }); + } if (attrs.imgClass) { $(element[0].firstChild).addClass(attrs.imgClass) diff --git a/app/partials/chat_modal.html b/app/partials/chat_modal.html index 90d456ce..b6cc69e4 100644 --- a/app/partials/chat_modal.html +++ b/app/partials/chat_modal.html @@ -88,7 +88,7 @@
-
+
diff --git a/app/partials/contacts_modal.html b/app/partials/contacts_modal.html index 54232890..1c9eb1e3 100644 --- a/app/partials/contacts_modal.html +++ b/app/partials/contacts_modal.html @@ -44,17 +44,9 @@ -
- - -
- +
-
+
diff --git a/app/partials/head.html b/app/partials/head.html index 70c4d900..2ccee573 100644 --- a/app/partials/head.html +++ b/app/partials/head.html @@ -75,10 +75,10 @@

- + typing - +
@@ -92,13 +92,13 @@ - + is typing - + , - + +{{historyState.typing.length - 1}} diff --git a/app/partials/im.html b/app/partials/im.html index 3443cd0e..8bab53ab 100644 --- a/app/partials/im.html +++ b/app/partials/im.html @@ -69,7 +69,7 @@
- +
@@ -132,7 +132,7 @@

- +
diff --git a/app/partials/peer_select.html b/app/partials/peer_select.html index 51da0b07..7402fdd7 100644 --- a/app/partials/peer_select.html +++ b/app/partials/peer_select.html @@ -36,7 +36,7 @@
- +
diff --git a/app/partials/settings_modal.html b/app/partials/settings_modal.html index 1b6a7eb4..818784a7 100644 --- a/app/partials/settings_modal.html +++ b/app/partials/settings_modal.html @@ -17,7 +17,7 @@

-

+

diff --git a/app/partials/user_modal.html b/app/partials/user_modal.html index 9c082930..45d06acc 100644 --- a/app/partials/user_modal.html +++ b/app/partials/user_modal.html @@ -16,7 +16,7 @@

-

+

diff --git a/app/webogram.appcache b/app/webogram.appcache index f623d043..0b7c5e7e 100644 --- a/app/webogram.appcache +++ b/app/webogram.appcache @@ -1,6 +1,6 @@ CACHE MANIFEST -# 26 +# 28 NETWORK: *