From 1945b9921340284e745b13668692d836d5e29d28 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Thu, 30 Jan 2014 14:30:29 +0400 Subject: [PATCH] Fixed some small bugs, disabled font-smoothing --- app/css/app.css | 3 +-- app/index.html | 6 +++--- app/js/app.js | 2 +- app/js/controllers.js | 2 +- app/partials/im.html | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/css/app.css b/app/css/app.css index 779290de..bf89d2e5 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -15,7 +15,7 @@ body { /*font: 12px/18px "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, Verdana, sans-serif;*/ /*font: 12px/18px Arial, "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, Verdana, sans-serif;*/ font: 12px/18px "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, Verdana, sans-serif; - -webkit-font-smoothing: antialiased; + /*-webkit-font-smoothing: antialiased;*/ } a { color: #3a6d99; @@ -853,7 +853,6 @@ div.im_message_video_thumb { .im_service_message_photo_thumb { display: block; - width: 100px; margin: 0 auto; } diff --git a/app/index.html b/app/index.html index cd3db598..6c789c74 100644 --- a/app/index.html +++ b/app/index.html @@ -7,7 +7,7 @@ - + @@ -51,9 +51,9 @@ - + - + diff --git a/app/js/app.js b/app/js/app.js index 11fb238c..e0835e8d 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -50,7 +50,7 @@ config(['$locationProvider', '$routeProvider', '$compileProvider', function($loc // $locationProvider.html5Mode(true); $routeProvider.when('/', {templateUrl: 'partials/welcome.html?1', controller: 'AppWelcomeController'}); $routeProvider.when('/login', {templateUrl: 'partials/login.html?2', controller: 'AppLoginController'}); - $routeProvider.when('/im', {templateUrl: 'partials/im.html?4', controller: 'AppIMController', reloadOnSearch: false}); + $routeProvider.when('/im', {templateUrl: 'partials/im.html?5', controller: 'AppIMController', reloadOnSearch: false}); $routeProvider.otherwise({redirectTo: '/'}); }]); diff --git a/app/js/controllers.js b/app/js/controllers.js index 0b685d82..212c2461 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -443,7 +443,7 @@ angular.module('myApp.controllers', []) } var now = +new Date(); - if (newVal === undefined || !newVal.length || now - lastTyping < 6000) { + if (newVal === undefined || !newVal.length || now - lastTyping < 5000) { return; } lastTyping = now; diff --git a/app/partials/im.html b/app/partials/im.html index 9511e5fc..e3637cc0 100644 --- a/app/partials/im.html +++ b/app/partials/im.html @@ -43,8 +43,8 @@
+ Info

- Info {{historyPeer.data | userStatus}}