Added ui-bootstrap to project

This commit is contained in:
Matt Styles
2013-05-07 22:01:31 +01:00
parent 0c90af5c09
commit 4f82ea6eb0
4 changed files with 8 additions and 20 deletions

3
.gitignore vendored
View File

@@ -5,4 +5,5 @@ app/components
.DS_Store
.idea
/BUILDLOG.md
/app/styles/css/main.css
/app/styles/css/main.css
/.jshint

View File

@@ -41,28 +41,14 @@
<script src="components/angular-cookies/angular-cookies.js"></script>
<script src="components/angular-sanitize/angular-sanitize.js"></script>
<script src="components/angular-socket-io/socket.js"></script>
<script src="components/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="components/jquery/jquery.min.js"><\/script>')</script>
<script src="components/underscore/underscore-min.js"></script>
<script src="components/socket.io-client/dist/socket.io.min.js"></script>
<!-- build:js scripts/vendor/bootstrap-min.js -->
<script src="components/bootstrap/js/bootstrap-transition.js"></script>
<script src="components/bootstrap/js/bootstrap-alert.js"></script>
<script src="components/bootstrap/js/bootstrap-modal.js"></script>
<script src="components/bootstrap/js/bootstrap-dropdown.js"></script>
<script src="components/bootstrap/js/bootstrap-scrollspy.js"></script>
<script src="components/bootstrap/js/bootstrap-tab.js"></script>
<script src="components/bootstrap/js/bootstrap-tooltip.js"></script>
<script src="components/bootstrap/js/bootstrap-popover.js"></script>
<script src="components/bootstrap/js/bootstrap-button.js"></script>
<script src="components/bootstrap/js/bootstrap-collapse.js"></script>
<script src="components/bootstrap/js/bootstrap-carousel.js"></script>
<script src="components/bootstrap/js/bootstrap-typeahead.js"></script>
<script src="components/bootstrap/js/bootstrap-affix.js"></script>
<!-- endbuild -->
<!-- build:js scripts/scripts.js -->
<script src="scripts/app.js"></script>
<script src="scripts/controllers/main.js"></script>

View File

@@ -1,6 +1,6 @@
'use strict';
angular.module('yoAngularExpressTestApp')
angular.module('yoAngularExpressTestApp', ['ui.bootstrap'])
.controller('MainCtrl', function ($scope) {
$scope.awesomeThings = [
@@ -8,7 +8,7 @@ angular.module('yoAngularExpressTestApp')
'AngularJS',
'Karma',
'jQuery',
'Bootstrap',
'UI-Bootstrap',
'Font-Awesome',
'Modernizr',
'Underscore'

View File

@@ -15,7 +15,8 @@
"font-awesome-more": "latest",
"modernizr": "~2.6.2",
"angular-socket-io": "~0.0.1",
"socket.io-client": "~0.9.11"
"socket.io-client": "~0.9.11",
"angular-bootstrap": "~0.3.0"
},
"devDependencies": {
"angular-mocks": "~1.0.5",