Skip to content

Commit

Permalink
refactor(build): build changes so it would be possible to deploy temp…
Browse files Browse the repository at this point in the history
…late
  • Loading branch information
lugovsky committed Jan 6, 2016
1 parent 7826b4c commit 03288fe
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 21 deletions.
10 changes: 9 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,15 @@
"main": "./jquery.slimscroll.js"
},
"font-awesome": {
"main": "css/font-awesome.css"
"main": [
"css/font-awesome.css",
"fonts/FontAwesome.otf",
"fonts/fontawesome-webfont.eot",
"fonts/fontawesome-webfont.svg",
"fonts/fontawesome-webfont.ttf",
"fonts/fontawesome-webfont.woff",
"fonts/fontawesome-webfont.woff2"
]
}
}
}
4 changes: 2 additions & 2 deletions gulp/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gulp.task('partials', function () {
quotes: true
}))
.pipe($.angularTemplatecache('templateCacheHtml.js', {
module: '123',
module: 'BlurAdmin',
root: 'app'
}))
.pipe(gulp.dest(conf.paths.tmp + '/partials/'));
Expand Down Expand Up @@ -85,7 +85,7 @@ gulp.task('other', function () {

return gulp.src([
path.join(conf.paths.src, '/**/*'),
path.join('!' + conf.paths.src, '/**/*.{html,css,js,scss}')
path.join('!' + conf.paths.src, '/**/*.{html,css,js,scss,md}')
])
.pipe(fileFilter)
.pipe(gulp.dest(path.join(conf.paths.dist, '/')));
Expand Down
24 changes: 12 additions & 12 deletions src/app/pages/tables/basic/tables.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@

<div class="row">
<div class="col-lg-6 col-md-12">
<blur-panel title="Hover Rows" class-container="with-scroll table-panel">
<div ba-panel ba-panel-title="Hover Rows" ba-panel-class="with-scroll table-panel">
<div include-with-scope="app/pages/tables/widgets/hoverRows.html"></div>
</blur-panel>
</div>
</div>
<div class="col-lg-6 col-md-12">
<blur-panel title="Bordered Table" class-container="with-scroll table-panel">
<div ba-panel ba-panel-title="Bordered Table" ba-panel-class="with-scroll table-panel">
<div include-with-scope="app/pages/tables/widgets/borderedTable.html"></div>
</blur-panel>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-12">
<blur-panel title="Condensed Table" class-container="with-scroll table-panel">
<div ba-panel ba-panel-title="Condensed Table" ba-panel-class="with-scroll table-panel">
<div include-with-scope="app/pages/tables/widgets/condensedTable.html"></div>
</blur-panel>
</div>
</div>
<div class="col-lg-6 col-md-12">
<blur-panel title="Striped Rows" class-container="with-scroll table-panel">
<div ba-panel ba-panel-title="Striped Rows" ba-panel-class="with-scroll table-panel">
<div include-with-scope="app/pages/tables/widgets/stripedRows.html"></div>
</blur-panel>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-12">
<blur-panel title="Contextual Table" class-container="with-scroll table-panel">
<div ba-panel ba-panel-title="Contextual Table" ba-panel-class="with-scroll table-panel">
<div include-with-scope="app/pages/tables/widgets/contextualTable.html"></div>
</blur-panel>
</div>
</div>
<div class="col-lg-6 col-md-12">
<blur-panel title="Responsive Table" class-container="with-scroll table-panel">
<div ba-panel-title="Responsive Table" ba-panel-class="with-scroll table-panel">
<div include-with-scope="app/pages/tables/widgets/responsiveTable.html"></div>
</blur-panel>
</div>
</div>
</div>

Expand Down
12 changes: 6 additions & 6 deletions src/app/pages/tables/smart/tables.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@

<div class="row">
<div class="col-md-12">
<blur-panel title="Smart Table With Filtering, Sorting And Pagination" class-container="with-scroll">
<div ba-panel ba-panel-title="Smart Table With Filtering, Sorting And Pagination" ba-panel-class="with-scroll">
<div include-with-scope="app/pages/tables/widgets/smartTable.html"></div>
</blur-panel>
</div>
</div>
</div>

<div class="row">
<div class="col-md-12">
<blur-panel title="Editable Cells" class-container="with-scroll">
<div ba-panel ba-panel-title="Editable Cells" ba-panel-class="with-scroll">
<div include-with-scope="app/pages/tables/widgets/editableTable.html"></div>
</blur-panel>
</div>
</div>
</div>

<div class="row">
<div class="col-md-12">
<blur-panel title="Editable Rows" class-container="with-scroll">
<div ba-panel ba-panel-title="Editable Rows" ba-panel-class="with-scroll">
<div include-with-scope="app/pages/tables/widgets/editableRowTable.html"></div>
</blur-panel>
</div>
</div>
</div>

Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit 03288fe

Please sign in to comment.