Skip to content

Commit

Permalink
update gulp, remove extra css files
Browse files Browse the repository at this point in the history
gulp running sass, less before webpack
removed all extra css which is not required now
  • Loading branch information
VikramTiwari committed Sep 3, 2016
1 parent 80484e6 commit 7c6ece6
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 760 deletions.
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
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 7c6ece6

Please sign in to comment.