Skip to content

Commit

Permalink
Show an explain card on empty favorites list
Browse files Browse the repository at this point in the history
  • Loading branch information
prevostc committed Mar 4, 2015
1 parent 2c38de6 commit 69b5f9c
Show file tree
Hide file tree
Showing 1,363 changed files with 47,306 additions and 18 deletions.
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"dependencies": {
"angular-local-storage": "~0.1.5",
"pixi": "~2.2.3",
"Faker": "~2.1.2"
"Faker": "~2.1.2",
"ionicons": "~2.0.1"
}
}
16 changes: 16 additions & 0 deletions www/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,20 @@
.item-avatar.my-image-item img {
max-width: 150px;
max-height: 150px;
}

.list .item:first-child{
border-top: none;
}

.list .item:last-child {
border-bottom: none;
}


.ion-star.favorite-button, .ion-star.favorite-button:focus, .ion-star.favorite-button:hover {
color: rgb(255, 206, 52);
}
.ion-checkmark.favorite-button, .ion-checkmark.favorite-button:focus, .ion-checkmark.favorite-button:hover {
color: rgb(43, 174, 55);
}
1 change: 1 addition & 0 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<title></title>

<link href="lib/ionic/css/ionic.css" rel="stylesheet">
<link href="lib/ionicons/css/ionicons.min.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">

<!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
Expand Down
10 changes: 5 additions & 5 deletions www/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
// 'starter.controllers' is found in controllers.js
angular.module('starter', ['ionic', 'starter.controllers', 'starter.services'])

.run(function ($ionicPlatform) {
.run(function ($ionicPlatform, $window) {
$ionicPlatform.ready(function () {
// Hide the accessory bar by default (remove this to show the accessory bar above the keyboard
// for form inputs)
if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
window.cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
if ($window.cordova && $window.cordova.plugins && $window.cordova.plugins.Keyboard) {
$window.cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
}
if (window.StatusBar) {
if ($window.StatusBar) {
// org.apache.cordova.statusbar required
window.StatusBar.styleDefault();
$window.StatusBar.styleDefault();
}
});
})
Expand Down
4 changes: 0 additions & 4 deletions www/js/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
this.catchPhrase = null;
}

// use function so that css has time to apply
var width = function(){ return document.querySelector('.canvas-container').offsetWidth; };
var height = function(){ return document.querySelector('.canvas-container').offsetHeight; };

angular.module('starter.controllers', [])

.controller('MapCtrl', function ($scope, $ionicPlatform, Settings, Favorites, Image, Faker, Id) {
Expand Down
41 changes: 41 additions & 0 deletions www/lib/ionicons/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"ignore": [
"**/.*",
"builder",
"node_modules",
"bower_components",
"test",
"tests"
],
"version": "2.0.1",
"name": "Ionicons",
"license": "MIT",
"authors": [
"Ben Sperry <[email protected]>",
"Adam Bradley <[email protected]>",
"Max Lynch <[email protected]>"
],
"keywords": [
"fonts",
"icon font",
"icons",
"ionic",
"web font"
],
"main": [
"css/ionicons.css",
"fonts/*"
],
"homepage": "https://github.com/driftyco/ionicons",
"description": "Ionicons - free and beautiful icons from the creators of Ionic Framework",
"_release": "2.0.1",
"_resolution": {
"type": "version",
"tag": "v2.0.1",
"commit": "ecb4b806831005c25b97ed9089fbb1d7dcc0879c"
},
"_source": "git://github.com/driftyco/ionicons.git",
"_target": "~2.0.1",
"_originalSource": "ionicons",
"_direct": true
}
21 changes: 21 additions & 0 deletions www/lib/ionicons/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014 Drifty (http://drifty.com/)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
31 changes: 31 additions & 0 deletions www/lib/ionicons/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"ignore": [
"**/.*",
"builder",
"node_modules",
"bower_components",
"test",
"tests"
],
"version": "2.0.0",
"name": "Ionicons",
"license": "MIT",
"authors": [
"Ben Sperry <[email protected]>",
"Adam Bradley <[email protected]>",
"Max Lynch <[email protected]>"
],
"keywords": [
"fonts",
"icon font",
"icons",
"ionic",
"web font"
],
"main": [
"css/ionicons.css",
"fonts/*"
],
"homepage": "https://github.com/driftyco/ionicons",
"description": "Ionicons - free and beautiful icons from the creators of Ionic Framework"
}
Loading

0 comments on commit 69b5f9c

Please sign in to comment.