Skip to content

Commit

Permalink
fixed textAngular issue - use own css
Browse files Browse the repository at this point in the history
  • Loading branch information
MacKentoch committed Sep 13, 2015
1 parent 03b7401 commit 37fb79a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
5 changes: 4 additions & 1 deletion EasyFormGenerator-StepWay-DEMO.html
Expand Up @@ -14,7 +14,10 @@
<link href="../bootswatch/paper/bootstrap.min.css" rel="stylesheet">
<link href="../font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../animate.css/animate.min.css" rel="stylesheet">
<link href='../textAngular/dist/textAngular.css' rel='stylesheet'>
<!--textAngular css is broken since 1.4.4-->
<!--<link href='../textAngular/dist/textAngular.css' rel='stylesheet'> -->
<!--use own to avoid bad surprise-->
<link href='../easy-form-generator/dist/css/eda.textAngular.min.css' rel='stylesheet'>
<link href='../angularjs-toaster/toaster.min.css' rel='stylesheet' >
<link href='../nya-bootstrap-select/dist/css/nya-bs-select.min.css' rel='stylesheet' >
<link href="../easy-form-generator/dist/css/eda.stepway.min.css" rel="stylesheet">
Expand Down
6 changes: 5 additions & 1 deletion EasyFormViewer-DEMO.html
Expand Up @@ -14,7 +14,11 @@
<link href="../bootswatch/paper/bootstrap.min.css" rel="stylesheet">
<link href="../font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../animate.css/animate.min.css" rel="stylesheet">
<link href='../textAngular/dist/textAngular.css' rel='stylesheet'>

<!--textAngular css is broken since 1.4.4-->
<!--<link href='../textAngular/dist/textAngular.css' rel='stylesheet'> -->
<!--use own to avoid bad surprise-->
<link href='../easy-form-generator/dist/css/eda.textAngular.min.css' rel='stylesheet'>
<link href='../nya-bootstrap-select/dist/css/nya-bs-select.min.css' rel='stylesheet' >
<link href="../easy-form-generator/dist/css/eda.easyFormViewer.min.css" rel="stylesheet">

Expand Down
1 change: 1 addition & 0 deletions dist/css/eda.textAngular.min.css

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

6 changes: 3 additions & 3 deletions gulpfile.js
Expand Up @@ -425,9 +425,6 @@ gulp.task('formviewer:templatecache', function() {






/**
* -------------------------------
* APP JS TASKS (STEPWAY WAY)
Expand Down Expand Up @@ -682,6 +679,9 @@ gulp.task('dist', [
gulp.src(gulpConfig.destDirs.app.css + '/*.css', {cwd: gulpConfig.base.root})
.pipe(gulp.dest(gulpConfig.bower.css ,{cwd: gulpConfig.base.distDir }));

//textAngular css fix
gulp.src(gulpConfig.srcFiles.app.common.customTextAngularCss, {cwd: gulpConfig.base.root})
.pipe(gulp.dest(gulpConfig.bower.css ,{cwd: gulpConfig.base.distDir }));
})


Expand Down

0 comments on commit 37fb79a

Please sign in to comment.