Skip to content

Commit

Permalink
Built using Angular Fullstack v2.0.13 from commit 9a8dac6
Browse files Browse the repository at this point in the history
  • Loading branch information
DaftMonk committed Aug 29, 2014
1 parent d64e533 commit 297c539
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 150 deletions.
3 changes: 3 additions & 0 deletions .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"html": true,
"sass": true,
"uirouter": true,
"bootstrap": false,
"uibootstrap": false,
"socketio": true,
"mongoose": true,
"auth": true,
Expand All @@ -27,6 +29,7 @@
"filterDirectory": "client/app/",
"serviceDirectory": "client/app/",
"basePath": "client",
"moduleName": "",
"filters": [
"uirouter"
],
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2014-08-26 using generator-angular-fullstack 2.0.12
// Generated on 2014-08-29 using generator-angular-fullstack 2.0.13
'use strict';

module.exports = function (grunt) {
Expand Down
3 changes: 0 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
"json3": "~3.3.1",
"es5-shim": "~3.0.1",
"jquery": "~1.11.0",
"bootstrap-sass-official": "~3.1.1",
"bootstrap": "~3.1.1",
"angular-resource": ">=1.2.*",
"angular-cookies": ">=1.2.*",
"angular-sanitize": ">=1.2.*",
"angular-bootstrap": "~0.11.0",
"font-awesome": ">=4.1.0",
"lodash": "~2.4.1",
"angular-socket-io": "~0.6.0",
Expand Down
24 changes: 0 additions & 24 deletions client/app/account/login/login.scss
Original file line number Diff line number Diff line change
@@ -1,25 +1 @@
// Colors
// --------------------------------------------------

$btnText: #fff;
$btnTextAlt: #000;

$btnTwitterBackground: #2daddc;
$btnTwitterBackgroundHighlight: #0271bf;
$btnGooglePlusBackground: #dd4b39;
$btnGooglePlusBackgroundHighlight: #c53727;
$btnGithubBackground: #fafafa;
$btnGithubBackgroundHighlight: #ccc;

// Social buttons
// --------------------------------------------------

.btn-twitter {
@include button-variant($btnText, $btnTwitterBackground, $btnTwitterBackgroundHighlight);
}
.btn-google-plus {
@include button-variant($btnText, $btnGooglePlusBackground, $btnGooglePlusBackgroundHighlight);
}
.btn-github {
@include button-variant($btnTextAlt, $btnGithubBackground, $btnGithubBackgroundHighlight);
}
3 changes: 1 addition & 2 deletions client/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ angular.module('demoApp', [
'ngResource',
'ngSanitize',
'btford.socket-io',
'ui.router',
'ui.bootstrap'
'ui.router'
])
.config(function ($stateProvider, $urlRouterProvider, $locationProvider, $httpProvider) {
$urlRouterProvider
Expand Down
11 changes: 8 additions & 3 deletions client/app/app.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
$icon-font-path: "/bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";

$fa-font-path: "/bower_components/font-awesome/fonts";

@import 'bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';
@import 'font-awesome/scss/font-awesome';

/**
Expand All @@ -15,10 +14,16 @@ $fa-font-path: "/bower_components/font-awesome/fonts";
padding: 0.2em 0;
}

/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
.container {
max-width: 730px;
}
}

// Component styles are injected through grunt
// injector
@import 'account/login/login.scss';
@import 'admin/admin.scss';
@import 'main/main.scss';
@import 'modal/modal.scss';
// endinjector
2 changes: 1 addition & 1 deletion client/app/main/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h1 class="page-header">Features:</h1>

<footer class="footer">
<div class="container">
<p>Angular Fullstack v2.0.12 |
<p>Angular Fullstack v2.0.13 |
<a href="https://twitter.com/tyhenkel">@tyhenkel</a> |
<a href="https://github.com/DaftMonk/generator-angular-fullstack/issues?state=open">Issues</a></p>
</div>
Expand Down
11 changes: 0 additions & 11 deletions client/components/modal/modal.html

This file was deleted.

25 changes: 0 additions & 25 deletions client/components/modal/modal.scss

This file was deleted.

77 changes: 0 additions & 77 deletions client/components/modal/modal.service.js

This file was deleted.

2 changes: 0 additions & 2 deletions client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/lodash/dist/lodash.compat.js"></script>
<script src="bower_components/angular-socket-io/socket.js"></script>
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
Expand All @@ -72,7 +71,6 @@
<script src="app/main/main.js"></script>
<script src="components/auth/auth.service.js"></script>
<script src="components/auth/user.service.js"></script>
<script src="components/modal/modal.service.js"></script>
<script src="components/mongoose-error/mongoose-error.directive.js"></script>
<script src="components/navbar/navbar.controller.js"></script>
<script src="components/socket/socket.service.js"></script>
Expand Down
1 change: 0 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = function(config) {
'client/bower_components/angular-cookies/angular-cookies.js',
'client/bower_components/angular-sanitize/angular-sanitize.js',
'client/bower_components/angular-route/angular-route.js',
'client/bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
'client/bower_components/lodash/dist/lodash.compat.js',
'client/bower_components/angular-socket-io/socket.js',
'client/bower_components/angular-ui-router/release/angular-ui-router.js',
Expand Down

0 comments on commit 297c539

Please sign in to comment.