reivilibre/TaskBoard
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #46 from alex3305/webfonts-fix-dev

Browse Source 
Webfonts fix dev
This commit is contained in:
Matt 2014-10-23 09:44:21 -04:00
commit 3fd821b25a
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -14,7 +14,7 @@
<link rel="stylesheet" href="lib/css/jquery-ui.min.css">
<link rel="stylesheet" href="lib/css/jquery-ui.structure.min.css">
<link rel="stylesheet" href="lib/css/spectrum.css">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Pontano+Sans|Raleway:500">
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Pontano+Sans|Raleway:500" data-noprefix>
<link rel="stylesheet" href="css/styles.css">
<!--[if lt IE 9]>

2
indexProd.html
View File

@ -10,7 +10,7 @@
<title>TaskBoard</title>
<link rel="stylesheet" href="lib/css/combined.min.css">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Pontano+Sans%7CRaleway:500">
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Pontano+Sans|Raleway:500" data-noprefix>
<link rel="stylesheet" href="css/styles.min.css">
<!--[if lt IE 9]>

2
js/controllers/boards.js
View File

@ -83,7 +83,7 @@ function ($scope, $routeParams, $location, $interval, $window,
if ($scope.boardId) {
$interval.cancel($scope.interval);
}
if ($scope.boardsLoaded && !$scope.boardId && $scope.currentUser && parseInt($scope.currentUser.defaultBoard)) {
if ($scope.boardsLoaded && !$scope.boardId && parseInt($scope.currentUser.defaultBoard)) {
$interval.cancel($scope.interval);
$location.path('boards/' + $scope.currentUser.defaultBoard);
}

4
js/controllers/header.js
View File

@ -33,9 +33,7 @@ function ($scope, $window, $location, UserService, AuthenticationService, AlertS
$scope.display.smallText = ' - File Viewer';
}
try {
$.noty.closeAll(); // Clear any alerts on page load.
} catch(e) {}
$.noty.closeAll(); // Clear any alerts on page load.
$scope.logout = function() {
UserService.logOut()