Improved fonts on windows, fixed small issues

app/css/app.css

@@ -11,12 +11,19 @@ html {
 }
 body {
   background: none;
-
-  /*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;*/
 }
+.font-light {
+  font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Light", Helvetica, Arial , Verdana, sans-serif;
+  font-weight: 300;
+}
+body.non_osx,
+.non_osx .font-light {
+  font: 12px/18px Verdana, Tahoma, sans-serif, Arial, Helvetica;
+  font-weight: normal;
+}
+
 a {
   color: #3a6d99;
 }
@@ -99,11 +106,6 @@ fieldset[disabled] .btn-tg.active {
   border-color: #999;
 }
 
-.font-light {
-  font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Light", Helvetica, Arial , Verdana, sans-serif;
-  font-weight: 300;
-}
-
 .tg_page_head .container {
   display: block;
   width: auto;
@@ -406,45 +408,24 @@ fieldset[disabled] .btn-tg.active {
   padding: 0 19px 0 12px;
   outline: none ! important;
 }
-.im_dialogs_scrollable_wrap .nav-stacked > li + li {
-  margin-top: 0;
-  margin-left: 0;
-}
-
 .im_dialogs_scrollable_wrap a.im_dialog {
+  clear: both;
+  overflow: hidden;
   color: #000;
   padding: 8px 9px;
   border-radius: 0;
-  border-bottom: 1px solid #FFF;
-}
-.im_dialogs_scrollable_wrap li:last-child a.im_dialog {
-  border-bottom: 1px solid #FFF;
-}
-
-.im_dialogs_scrollable_wrap a.im_dialog:hover,
-.im_dialogs_scrollable_wrap .active a.im_dialog {
-  margin-top: -1px;
-  overflow: hidden;
 }
 .im_dialogs_scrollable_wrap a.im_dialog:hover {
+  border-radius: 2px;
   background: #f2f6fa;
-  border-top: 1px solid #f2f6fa;
-  border-bottom-color: #f2f6fa;
 }
 .im_dialogs_scrollable_wrap .active a.im_dialog {
   border-radius: 2px;
   background-color: #5785A5;
-  border-top: 1px solid #5785A5;
-  border-bottom-color: #5785A5;
 }
 .im_dialogs_scrollable_wrap .active a.im_dialog:hover {
   background-color: #5785A5;
 }
-.im_dialogs_scrollable_wrap li:first-child a.im_dialog,
-.im_dialogs_scrollable_wrap .active + li > a.im_dialog {
-  margin-top: 0;
-  border-top: 0;
-}
 
 .im_dialogs_scrollable_wrap a.im_dialog .icon,
 .im_dialogs_scrollable_wrap a.im_dialog .glyphicon {

app/index.html

@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="vendor/angular/angular-csp.css"/>
   <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.css"/>
   <link rel="stylesheet" href="vendor/jquery.nanoscroller/nanoscroller.css"/>
-  <link rel="stylesheet" href="css/app.css?9"/>
+  <link rel="stylesheet" href="css/app.css?10"/>
   <link rel="icon" href="favicon.ico" type="image/x-icon">
 
   <meta property="og:title" content="Webogram">
@@ -51,9 +51,9 @@
   <script type="text/javascript" src="js/lib/mtproto.js?17"></script>
 
   <script type="text/javascript" src="js/util.js"></script>
-  <script type="text/javascript" src="js/app.js?7"></script>
+  <script type="text/javascript" src="js/app.js?8"></script>
   <script type="text/javascript" src="js/services.js?10"></script>
-  <script type="text/javascript" src="js/controllers.js?15"></script>
+  <script type="text/javascript" src="js/controllers.js?16"></script>
   <script type="text/javascript" src="js/filters.js?3"></script>
   <script type="text/javascript" src="js/directives.js?9"></script>
 

app/js/app.js

@@ -9,7 +9,12 @@
 
 window._testMode = location.search.indexOf('test=1') > 0;
 window._debugMode = location.search.indexOf('debug=1') > 0;
+window._osX = (navigator.platform || '').toLowerCase().indexOf('mac') != -1 ||
+              (navigator.userAgent || '').toLowerCase().indexOf('mac') != -1;
 
+if (!window._osX) {
+  $('body').addClass('non_osx');
+}
 
 // Declare app level module which depends on filters, and services
 angular.module('myApp', [
@@ -48,7 +53,7 @@ config(['$locationProvider', '$routeProvider', '$compileProvider', function($loc
 
 
   // $locationProvider.html5Mode(true);
-  $routeProvider.when('/', {templateUrl: 'partials/welcome.html?1', controller: 'AppWelcomeController'});
+  $routeProvider.when('/', {templateUrl: 'partials/welcome.html?2', controller: 'AppWelcomeController'});
   $routeProvider.when('/login', {templateUrl: 'partials/login.html?2', controller: 'AppLoginController'});
   $routeProvider.when('/im', {templateUrl: 'partials/im.html?5', controller: 'AppIMController', reloadOnSearch: false});
   $routeProvider.otherwise({redirectTo: '/'});

app/js/controllers.js

@@ -15,6 +15,8 @@ angular.module('myApp.controllers', [])
     MtpApiManager.getUserID().then(function (id) {
       if (id) {
         $location.url('/im');
+      } else {
+        $scope.showWelcome = true;
       }
     });
   })
@@ -467,7 +469,7 @@ angular.module('myApp.controllers', [])
           return false;
         }
 
-        text = text.replace(/:([a-z0-9\-_]+?):/gi, function (all, name) {
+        text = text.replace(/:([a-z0-9\-\+\*_]+?):/gi, function (all, name) {
           var utfChar = $.emojiarea.reverseIcons[name];
           if (utfChar !== undefined) {
             return utfChar;

app/partials/dialog.html

@@ -1,4 +1,4 @@
-<a class="im_dialog clearfix" href="#/im?p={{dialogMessage.peerString}}">
+<a class="im_dialog" href="#/im?p={{dialogMessage.peerString}}">
 
   <div class="im_dialog_meta pull-right text-right">
     <div class="im_dialog_date">

app/partials/welcome.html

@@ -1,5 +1,8 @@
 <div ng-include="'partials/head.html?1'"></div>
 
+
+<div ng-show="showWelcome">
+
   <div class="welcome_logo"></div>
 
   <div class="welcome_box_wrap">
@@ -11,3 +14,5 @@
     <a href="#/login" class="btn btn-tg btn-block">Start Messaging</a>
     </form>
   </div>
+
+</div>