Browse Source

Fixed screen width, disabled transitions

master
Igor Zhukov 10 years ago
parent
commit
a5d92adaa7
  1. 21
      app/css/app.css
  2. 4
      app/js/controllers.js
  3. 4
      app/js/lib/config.js

21
app/css/app.css

@ -879,13 +879,17 @@ a.tg_radio_on:hover i.icon-radio {
background : rgba(0,0,0,0.0); background : rgba(0,0,0,0.0);
width : 12px; width : 12px;
right: 0px; right: 0px;
-webkit-transition : .2s;
-moz-transition : .2s;
-o-transition : .2s;
transition : .2s;
-moz-border-radius : 0; -moz-border-radius : 0;
-webkit-border-radius : 0; -webkit-border-radius : 0;
border-radius : 0; border-radius : 0;
/*-webkit-transition : .2s;
-moz-transition : .2s;
-o-transition : .2s;
transition : .2s;*/
-webkit-transition : none;
-moz-transition : none;
-o-transition : none;
transition : none;
} }
.im_dialogs_col .nano > .pane > .slider { .im_dialogs_col .nano > .pane > .slider {
background: #A5B1B9; background: #A5B1B9;
@ -1136,13 +1140,18 @@ a.im_dialog_selected .im_dialog_date {
width : 9px; width : 9px;
right: 0; right: 0;
top: 0; top: 0;
-webkit-transition : .2s; /*-webkit-transition : .2s;
-moz-transition : .2s; -moz-transition : .2s;
-o-transition : .2s; -o-transition : .2s;
transition : .2s; transition : .2s;*/
-moz-border-radius : 2px; -moz-border-radius : 2px;
-webkit-border-radius : 2px; -webkit-border-radius : 2px;
border-radius : 2px; border-radius : 2px;
-webkit-transition : none;
-moz-transition : none;
-o-transition : none;
transition : none;
} }
.contacts_modal_col .nano > .pane { .contacts_modal_col .nano > .pane {

4
app/js/controllers.js

@ -321,7 +321,9 @@ angular.module('myApp.controllers', [])
if ($routeParams.q !== lastSearch) { if ($routeParams.q !== lastSearch) {
$scope.search.query = lastSearch = $routeParams.q; $scope.search.query = lastSearch = $routeParams.q;
$scope.search.messages = true; $scope.search.messages = true;
return false; if ($scope.curDialog !== undefined) {
return false;
}
} }
} else { } else {
lastSearch = false; lastSearch = false;

4
app/js/lib/config.js

@ -35,8 +35,8 @@ Config.Navigator = {
osX: (navigator.platform || '').toLowerCase().indexOf('mac') != -1 || osX: (navigator.platform || '').toLowerCase().indexOf('mac') != -1 ||
(navigator.userAgent || '').toLowerCase().indexOf('mac') != -1, (navigator.userAgent || '').toLowerCase().indexOf('mac') != -1,
retina: window.devicePixelRatio > 1, retina: window.devicePixelRatio > 1,
touch: $(window).width() <= 768, touch: screen.width <= 768,
mobile: $(window).width() < 480 mobile: screen.width < 480
}; };
Config.Schema = Config.Schema || {}; Config.Schema = Config.Schema || {};

Loading…
Cancel
Save