Skip to content

Commit

Permalink
Merge branch 'feature_angular_material'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
VikramTiwari committed Sep 12, 2016
2 parents 673e873 + 7c6ece6 commit 80cdd0f
Show file tree
Hide file tree
Showing 20 changed files with 326 additions and 1,097 deletions.
8 changes: 5 additions & 3 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import 'angular/angular-csp.css'
import 'angular-ui-select/select.min.css'
import 'bootstrap/dist/css/bootstrap.min.css'
import 'angular-material/angular-material.min.css'

import jQuery from 'jquery'
import 'angular'
Expand All @@ -13,7 +13,9 @@ import 'angular-resource'
import 'angular-sanitize'
import 'angular-ui-router'
import 'angular-jwt'
import 'angular-bootstrap/ui-bootstrap-tpls'
import 'angular-aria'
import 'angular-animate'
import 'angular-material'

window.$ = jQuery

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

function processModules (modules) {
var packageModules = ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.router', 'ui.select', 'ngSanitize']
var packageModules = ['ngCookies', 'ngResource', 'ui.router', 'ui.select', 'ngSanitize', 'ngMaterial']
var m
var mn
for (var index in modules) {
Expand Down
2 changes: 1 addition & 1 deletion gulp/development.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ myDevConfig.devtool = 'sourcemap'
myDevConfig.debug = true
// create a single instance of the compiler to allow caching
var devCompiler = webpack(myDevConfig)
gulp.task('webpack:build-dev', function (callback) {
gulp.task('webpack:build-dev', ['sass', 'less'], function (callback) {
// run webpack
devCompiler.run(function (err, stats) {
if (err) throw new gutil.PluginError('webpack:build-dev', err)
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"license": "MIT",
"scripts": {
"start": "node server",
"start": "DEBUG=cluster node server",
"mocha": "node tools/test/run-mocha.js",
"karma": "node node_modules/karma/bin/karma start karma.conf.js",
"test": "gulp test",
Expand All @@ -23,9 +23,12 @@
},
"dependencies": {
"angular": "^1.5.5",
"angular-animate": "^1.5.8",
"angular-aria": "^1.5.8",
"angular-bootstrap": "^0.12.2",
"angular-cookies": "^1.5.2",
"angular-jwt": "latest",
"angular-material": "^1.1.0",
"angular-mocks": "^1.5.2",
"angular-resource": "^1.5.2",
"angular-route": "^1.5.2",
Expand All @@ -38,6 +41,7 @@
"connect-flash": "latest",
"connect-modrewrite": "latest",
"consolidate": "latest",
"debug": "^2.2.0",
"express": "^4.14.0",
"helmet": "^2.1.1",
"lodash": "latest",
Expand Down
51 changes: 5 additions & 46 deletions packages/custom/meanStarter/public/assets/css/common.css
Original file line number Diff line number Diff line change
@@ -1,47 +1,6 @@
.page-header {
padding-bottom: 0 !important;
margin: 0 !important;
border-bottom: 0 !important;
.MEAN-logo {
content: url('/meanStarter/assets/img/logo.png');
height: 100%;
width: 2.5%;
margin-right: 0.5em;
}
.page-header .navbar-nav {
float: right;
}
.page-header > div > div, .page-header > div > ul {
display: inline-block;
}
.text-edit {
float: right;
margin-top: 12px;
}
.account {
text-align:right;
}
.account > div, .account > ul {
text-align: left;
}
.navbar .nav > li > a.brand {
padding-left: 20px;
margin-left: 0
}
.content {
margin-top: 70px;
width: 100%
}
footer {
position: fixed;
left: 0;
bottom: 0;
height: 30px;
width: 100%;
background: #ddd;
-webkit-box-shadow: 0 8px 6px 6px black;
-moz-box-shadow: 0 8px 6px 6px black;
box-shadow: 0 8px 6px 6px black
}
footer p {
padding: 5px 0 12px 10px
}

.featuredpic img{
width:510px;
}
Loading

0 comments on commit 80cdd0f

Please sign in to comment.