kopia lustrzana https://github.com/FacilMap/facilmap
Add bootstrap to dependencies
rodzic
ec46b90fd3
commit
d65e182260
|
@ -4,7 +4,7 @@ var FacilPad = {
|
|||
|
||||
(function(fp, $, ng, undefined) {
|
||||
|
||||
fp.app = angular.module("facilpad", [ "ui.sortable" ]).config([ "$compileProvider", function($compileProvider) {
|
||||
fp.app = angular.module("facilpad", [ "ui.sortable", "ui.bootstrap" ]).config([ "$compileProvider", function($compileProvider) {
|
||||
$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/);
|
||||
} ]);
|
||||
|
||||
|
|
|
@ -20,6 +20,18 @@
|
|||
"marked": "^0.3.6",
|
||||
"angular-ui-sortable": "^0.14.3",
|
||||
"FileSaver": "https://raw.githubusercontent.com/eligrey/FileSaver.js/master/FileSaver.js",
|
||||
"blob": "*"
|
||||
"blob": "*",
|
||||
"angular-bootstrap": "^2.1.4",
|
||||
"bootstrap": "^3.3.7"
|
||||
},
|
||||
"overrides": {
|
||||
"bootstrap": {
|
||||
"main": [
|
||||
"dist/css/bootstrap.css",
|
||||
"dist/css/bootstrap-theme.css",
|
||||
"dist/js/bootstrap.js",
|
||||
"dist/fonts/glyphicons-halflings-regular.ttf"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,14 +44,19 @@ gulp.task("deps", function() {
|
|||
gulpIf([ "**/*.js", "**/*.css" ], combine(
|
||||
gulpIf("**/*.js", combine(
|
||||
newer("build/dependencies.js"),
|
||||
sourcemaps.init(),
|
||||
sourcemaps.init({ loadMaps: true }),
|
||||
concat("dependencies.js"),
|
||||
uglify(),
|
||||
sourcemaps.write("./sourcemaps")
|
||||
)),
|
||||
gulpIf("**/*.css", combine(
|
||||
newer("build/dependencies.css"),
|
||||
sourcemaps.init(),
|
||||
gulpIf("**/bower_components/bootstrap/**", combine(
|
||||
replace("src: url('../fonts/glyphicons-halflings-regular.eot');", ""),
|
||||
replace(/src: url\('\.\.\/fonts\/glyphicons-halflings-regular\..*/g, "src: url('../fonts/glyphicons-halflings-regular.ttf') format('truetype');")
|
||||
)),
|
||||
cssBase64({ maxWeightResource: 1000000 }),
|
||||
sourcemaps.init({ loadMaps: true }),
|
||||
concat("dependencies.css"),
|
||||
cleanCss(),
|
||||
sourcemaps.write("./sourcemaps")
|
||||
|
|
Ładowanie…
Reference in New Issue