Skip to content

Commit

Permalink
Added some sweet animations!
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoverbruggen committed Jun 2, 2014
1 parent 37d0f4b commit cede54b
Show file tree
Hide file tree
Showing 13 changed files with 1,776 additions and 7 deletions.
2 changes: 2 additions & 0 deletions app/views/core/head.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
<link rel="shortcut icon" href="{{ URL::asset('favicon.ico') }}"/>
<link rel="stylesheet" href="{{ URL::asset('bower_components/bootstrap-sass/lib/bootstrap.css') }}">
<link rel="stylesheet" href="{{ URL::asset('bower_components/fontawesome/css/font-awesome.min.css') }}"/>
<link rel="stylesheet" href="{{ URL::asset('bower_components/animate.css/animate.min.css') }}"/>
<link rel="stylesheet" href="{{ URL::asset('css/main.css') }}">
<script src="{{ URL::asset('bower_components/jquery/dist/jquery.min.js') }}"></script>
<script src="{{ URL::asset('bower_components/angular/angular.min.js') }}"></script>
<script src="{{ URL::asset('bower_components/angular-animate/angular-animate.min.js') }}"></script>
<script src="{{ URL::asset('bower_components/bootstrap-sass/dist/js/bootstrap.js') }}"></script>
<script src="{{ URL::asset('bower_components/angular-bootstrap/ui-bootstrap.min.js') }}"></script>
<script src="{{ URL::asset('js/irailapp/app.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion app/views/route/planner.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</div>
</div>
</div>
<div class="row" ng-show="loading">
<div class="row loading" ng-show="loading">
<div class="col-md-12 col-sm-12">
<div class="loader">Loading...</div>
<h4 class="center lg">{{Lang::get('client.loadingHeader')}}</h4>
Expand Down
19 changes: 19 additions & 0 deletions public/bower_components/angular-animate/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "angular-animate",
"version": "1.2.16",
"main": "./angular-animate.js",
"dependencies": {
"angular": "1.2.16"
},
"homepage": "https://github.com/angular/bower-angular-animate",
"_release": "1.2.16",
"_resolution": {
"type": "version",
"tag": "v1.2.16",
"commit": "4eccd8ec8356a33bf3a98958d7a73b71290d3985"
},
"_source": "git://github.com/angular/bower-angular-animate.git",
"_target": "~1.2.16",
"_originalSource": "angular-animate",
"_direct": true
}
54 changes: 54 additions & 0 deletions public/bower_components/angular-animate/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# bower-angular-animate

This repo is for distribution on `bower`. The source for this module is in the
[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngAnimate).
Please file issues and pull requests against that repo.

## Install

Install with `bower`:

```shell
bower install angular-animate
```

Add a `<script>` to your `index.html`:

```html
<script src="/bower_components/angular-animate/angular-animate.js"></script>
```

And add `ngAnimate` as a dependency for your app:

```javascript
angular.module('myApp', ['ngAnimate']);
```

## Documentation

Documentation is available on the
[AngularJS docs site](http://docs.angularjs.org/api/ngAnimate).

## License

The MIT License

Copyright (c) 2010-2012 Google, Inc. http://angularjs.org

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.
Loading

0 comments on commit cede54b

Please sign in to comment.