Skip to content

Commit

Permalink
made several to file organization and performed a lot of cleanup per …
Browse files Browse the repository at this point in the history
…feedback from Cam
  • Loading branch information
stateoflux committed Feb 1, 2014
1 parent b6da2a6 commit 5984a7a
Show file tree
Hide file tree
Showing 57 changed files with 86 additions and 79,930 deletions.
4 changes: 3 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
"d3": "~3.4.1",
"nvd3": "~1.1.15-beta",
"angularjs-nvd3-directives": "~0.0.5-beta",
"font-awesome": "~4.0.3"
"font-awesome": "~4.0.3",
"ionic": "0.9.20-alpha",
"ionicons": "~1.4.1"
},
"resolutions": {
"angular": "~1.2.11",
Expand Down
19 changes: 9 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@
</side-menus>

<!-- angularjs scripts -->
<script src="js/ionic.min.js"></script>
<script src="./bower_components/angular/angular.min.js"></script>
<script src="js/angular/angular-animate.min.js"></script>
<script src="js/angular/angular-route.min.js"></script>
<script src="js/angular/angular-touch.min.js"></script>
<script src="js/angular/angular-sanitize.min.js"></script>
<script src="js/angular-ui/angular-ui-router.min.js"></script>
<script src="js/ionic-angular.min.js"></script>
<script src="bower_components/ionic/dist/js/ionic.min.js"></script>
<script src="bower_components/ionic/dist/js/angular/angular.min.js"></script>
<!-- <script src="./bower_components/angular/angular.min.js"></script> -->
<script src="bower_components/ionic/dist/js/angular/angular-animate.min.js"></script>
<script src="bower_components/ionic/dist/js/angular/angular-route.min.js"></script>
<script src="bower_components/ionic/dist/js/angular/angular-touch.min.js"></script>
<script src="bower_components/ionic/dist/js/angular/angular-sanitize.min.js"></script>
<script src="bower_components/ionic/dist/js/angular-ui/angular-ui-router.min.js"></script>
<script src="bower_components/ionic/dist/js/ionic-angular.min.js"></script>
<script src="bower_components/angular-local-storage/angular-local-storage.min.js"></script>
<!-- <script src="http://localhost:35729/livereload.js"></script> -->

Expand All @@ -85,14 +86,12 @@
<script src="js/src/services/categoriesValue.js"></script>

<!-- CONTROLLERS -->
<!-- <script src="js/src/controllers/controllers.js"></script> -->
<script src="js/src/controllers/cardsController.js"></script>
<script src="js/src/controllers/chartController.js"></script>
<script src="js/src/controllers/connectDevicesController.js"></script>
<script src="js/src/controllers/loginController.js"></script>
<script src="js/src/controllers/mainController.js"></script>
<script src="js/src/controllers/signupController.js"></script>
<script src="js/src/controllers/searchBarController.js"></script>
<script src="js/src/controllers/topBarController.js"></script>
</body>
</html>
28 changes: 0 additions & 28 deletions public/css/app.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

/* Custom Fonts */

body {
background-color: #ccc;
}
Expand All @@ -22,29 +20,10 @@ body {
height: 75px;
}

.mast-head {
color: #fff;
padding: 40px;
font-weight: bold;
text-align: center;
}
.mast-head .title {
font-size: 30px;
}
.mast-head p {
font-size: 20px;
line-height: 25px;
}

.bar-fittr {
background-color: rgba(41, 128, 185,1.0);
}

.debug h3 {
color: #fff;
margin-top: 30px;
text-align: center;
}
.button-container {
padding: 30px 40px;
}
Expand Down Expand Up @@ -144,15 +123,13 @@ a.device p {
}

.diffNum {
/*color: #00FF00;*/
color: #0088ff;
font-family: 'Quantico';
font-size: 28px;
font-weight: bold;
}

.catDiff {
/*color: #00FF00;*/
color: #0088ff;
font-family: 'Quantico';
font-size: 18px;
Expand All @@ -171,7 +148,6 @@ a.device p {
}

.losing {
/*background-color: #c0392b;*/
background-color: #E74C3C;
}

Expand Down Expand Up @@ -263,7 +239,6 @@ a.device p {
border-top-right-radius: 5px;
background-color: rgba(0, 0, 0, 0);
width:100%;
/*border: 1px solid #222;*/
}

.card-bar {
Expand All @@ -283,9 +258,6 @@ a.device p {

.their-bar {
background-color: rgba(236, 240, 241,1.0);
/*background-color: #7f8c8d;*/
/*background-color: #FFF;*/
/*background-color: rgba(230, 126, 34,1.0);*/
}

.col {
Expand Down
89 changes: 0 additions & 89 deletions public/css/backup/app.css

This file was deleted.

Loading

0 comments on commit 5984a7a

Please sign in to comment.