Skip to content

Commit

Permalink
support for selecting view templates (bootstrap/material)
Browse files Browse the repository at this point in the history
  • Loading branch information
mwasiluk committed Apr 6, 2016
1 parent ea66ff5 commit 435d4f6
Show file tree
Hide file tree
Showing 49 changed files with 3,244 additions and 47 deletions.
4 changes: 3 additions & 1 deletion bower.json
Expand Up @@ -35,8 +35,10 @@
"Sortable": "dev"
},
"devDependencies": {
"bootstrap-sass": "3.x",
"angular-translate-loader-partial": "2.x",
"angular-translate-loader-static-files": "2.x",
"angular-mocks": "~1.4.8"
"angular-mocks": "~1.4.8",
"angular-material": "^1.0.7"
}
}
5 changes: 3 additions & 2 deletions demo/demo.html
Expand Up @@ -6,7 +6,7 @@
<link rel="stylesheet" href="../bower_components/angular/angular-csp.css">
<link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="../dist/form-builder.min.css">
<link rel="stylesheet" href="../dist/form-builder-bootstrap.min.css">
<link rel="stylesheet" href="../dist/form-viewer.min.css">
<link rel="stylesheet" href="demo.css">
</head>
Expand Down Expand Up @@ -180,8 +180,9 @@ <h4><a ng-click="ctrl.cgetResponseSheet = !ctrl.cgetResponseSheet" href="#getRes
<script src="../bower_components/Sortable/ng-sortable.js"></script>
<script src="../dist/form-utils.min.js"></script>
<script src="../dist/form-builder.min.js"></script>
<script src="../dist/form-builder-bootstrap-tpls.min.js"></script>
<script src="../dist/form-viewer.min.js"></script>

<script src="../dist/form-viewer-bootstrap-tpls.min.js"></script>
<script src="demo.js"></script>


Expand Down
2 changes: 1 addition & 1 deletion demo/demo.js
@@ -1,4 +1,4 @@
angular.module('app', ['mwFormBuilder', 'mwFormViewer', 'mwFormUtils', 'pascalprecht.translate', 'monospaced.elastic'])
angular.module('app', ['ui.bootstrap', 'mwFormBuilder', 'mwFormViewer', 'mwFormUtils', 'pascalprecht.translate', 'monospaced.elastic'])
.config(function($translateProvider){
$translateProvider.useStaticFilesLoader({
prefix: '../dist/i18n/',
Expand Down
2 changes: 2 additions & 0 deletions dist/form-builder-bootstrap-tpls.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/form-builder-bootstrap.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions dist/form-builder-material-tpls.min.js

Large diffs are not rendered by default.

1,405 changes: 1,386 additions & 19 deletions dist/form-builder.min.js

Large diffs are not rendered by default.

0 comments on commit 435d4f6

Please sign in to comment.