Skip to content

Commit 80cdd0f

Browse files
committed
Merge branch 'feature_angular_material'
* feature_angular_material: update gulp, remove extra css files use debug module update social buttons user package with material design added footer material for system package adds angular-material support
2 parents 673e873 + 7c6ece6 commit 80cdd0f

File tree

20 files changed

+326
-1097
lines changed

20 files changed

+326
-1097
lines changed

app.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import 'angular/angular-csp.css'
44
import 'angular-ui-select/select.min.css'
5-
import 'bootstrap/dist/css/bootstrap.min.css'
5+
import 'angular-material/angular-material.min.css'
66

77
import jQuery from 'jquery'
88
import 'angular'
@@ -13,7 +13,9 @@ import 'angular-resource'
1313
import 'angular-sanitize'
1414
import 'angular-ui-router'
1515
import 'angular-jwt'
16-
import 'angular-bootstrap/ui-bootstrap-tpls'
16+
import 'angular-aria'
17+
import 'angular-animate'
18+
import 'angular-material'
1719

1820
window.$ = jQuery
1921

@@ -26,7 +28,7 @@ angular.element(document).ready(function () {
2628
})
2729

2830
function processModules (modules) {
29-
var packageModules = ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.router', 'ui.select', 'ngSanitize']
31+
var packageModules = ['ngCookies', 'ngResource', 'ui.router', 'ui.select', 'ngSanitize', 'ngMaterial']
3032
var m
3133
var mn
3234
for (var index in modules) {

gulp/development.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ myDevConfig.devtool = 'sourcemap'
106106
myDevConfig.debug = true
107107
// create a single instance of the compiler to allow caching
108108
var devCompiler = webpack(myDevConfig)
109-
gulp.task('webpack:build-dev', function (callback) {
109+
gulp.task('webpack:build-dev', ['sass', 'less'], function (callback) {
110110
// run webpack
111111
devCompiler.run(function (err, stats) {
112112
if (err) throw new gutil.PluginError('webpack:build-dev', err)

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"license": "MIT",
1414
"scripts": {
15-
"start": "node server",
15+
"start": "DEBUG=cluster node server",
1616
"mocha": "node tools/test/run-mocha.js",
1717
"karma": "node node_modules/karma/bin/karma start karma.conf.js",
1818
"test": "gulp test",
@@ -23,9 +23,12 @@
2323
},
2424
"dependencies": {
2525
"angular": "^1.5.5",
26+
"angular-animate": "^1.5.8",
27+
"angular-aria": "^1.5.8",
2628
"angular-bootstrap": "^0.12.2",
2729
"angular-cookies": "^1.5.2",
2830
"angular-jwt": "latest",
31+
"angular-material": "^1.1.0",
2932
"angular-mocks": "^1.5.2",
3033
"angular-resource": "^1.5.2",
3134
"angular-route": "^1.5.2",
@@ -38,6 +41,7 @@
3841
"connect-flash": "latest",
3942
"connect-modrewrite": "latest",
4043
"consolidate": "latest",
44+
"debug": "^2.2.0",
4145
"express": "^4.14.0",
4246
"helmet": "^2.1.1",
4347
"lodash": "latest",
Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,6 @@
1-
.page-header {
2-
padding-bottom: 0 !important;
3-
margin: 0 !important;
4-
border-bottom: 0 !important;
1+
.MEAN-logo {
2+
content: url('/meanStarter/assets/img/logo.png');
3+
height: 100%;
4+
width: 2.5%;
5+
margin-right: 0.5em;
56
}
6-
.page-header .navbar-nav {
7-
float: right;
8-
}
9-
.page-header > div > div, .page-header > div > ul {
10-
display: inline-block;
11-
}
12-
.text-edit {
13-
float: right;
14-
margin-top: 12px;
15-
}
16-
.account {
17-
text-align:right;
18-
}
19-
.account > div, .account > ul {
20-
text-align: left;
21-
}
22-
.navbar .nav > li > a.brand {
23-
padding-left: 20px;
24-
margin-left: 0
25-
}
26-
.content {
27-
margin-top: 70px;
28-
width: 100%
29-
}
30-
footer {
31-
position: fixed;
32-
left: 0;
33-
bottom: 0;
34-
height: 30px;
35-
width: 100%;
36-
background: #ddd;
37-
-webkit-box-shadow: 0 8px 6px 6px black;
38-
-moz-box-shadow: 0 8px 6px 6px black;
39-
box-shadow: 0 8px 6px 6px black
40-
}
41-
footer p {
42-
padding: 5px 0 12px 10px
43-
}
44-
45-
.featuredpic img{
46-
width:510px;
47-
}

0 commit comments

Comments
 (0)