Skip to content

Commit 016194d

Browse files
mchapmanmchapman
committed
Move style sheets to /css in bower folder
1 parent 1d15f86 commit 016194d

File tree

8 files changed

+41
-19
lines changed

8 files changed

+41
-19
lines changed

‎Gruntfile.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/partials/get-started.html

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,19 @@ <h3>Create</h3>
6969
cd myapp
7070
express
7171
npm install
72-
npm install forms-angular --save
72+
73+
if [ $1 ]; then
74+
npm install forms-angular-test --save
75+
else
76+
npm install forms-angular --save
77+
fi
7378
npm install mongoose --save
7479
cd public
75-
bower install forms-angular --allow-root
80+
if [ $1 ]; then
81+
bower install forms-angular#dev --allow-root
82+
else
83+
bower install forms-angular --allow-root
84+
fi
7685
cd ..</code></pre>
7786
</section>
7887
<section id="server-code" name="Server Code" affix-scroll>
@@ -131,18 +140,18 @@ <h3>Create your front end</h3>
131140
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/bootstrap/js/bootstrap-transition.js&quot;&gt;&lt;/script&gt;
132141
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/bootstrap/js/bootstrap-collapse.js&quot;&gt;&lt;/script&gt;
133142
&lt;link rel=&quot;stylesheet&quot; href=&quot;/bower_components/ng-grid/ng-grid.css&quot;&gt;
134-
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ng-grid/ng-grid-2.0.9.debug.js&quot;&gt;&lt;/script&gt;
143+
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ng-grid/ng-grid-2.0.7.debug.js&quot;&gt;&lt;/script&gt;
135144
&lt;link rel=&quot;stylesheet&quot; href=&quot;/bower_components/select2/select2.css&quot;&gt;
136145
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/angular-elastic/elastic.js&quot;&gt;&lt;/script&gt;
137146
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/select2/select2.js&quot;&gt;&lt;/script&gt;
138147
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ckeditor/ckeditor.js&quot;&gt;&lt;/script&gt;
139-
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ng-ckeditor/ng-ckeditor.src.js&quot;&gt;&lt;/script&gt;
148+
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ng-ckeditor/ng-ckeditor.js&quot;&gt;&lt;/script&gt;
140149
&lt;!--[if lt IE 9]&gt;
141150
&lt;script src=&quot;/bower_components/html5shiv-dist/html5shiv.js&quot;&gt;&lt;/script&gt;
142151
&lt;![endif]--&gt;
143152

144153
&lt;!--forms-angular stuff--&gt;
145-
&lt;link rel=&quot;stylesheet&quot; href=&quot;/bower_components/forms-angular/forms-angular-bs2.css&quot;&gt;
154+
&lt;link rel=&quot;stylesheet&quot; href=&quot;/bower_components/forms-angular/css/forms-angular-bs2.css&quot;&gt;
146155
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/forms-angular/forms-angular.js&quot;&gt;&lt;/script&gt;
147156
&lt;script src=&quot;/myapp.js&quot;&gt;&lt;/script&gt;
148157
&lt;style type=&quot;text/css&quot; media=&quot;all&quot;&gt;

‎app/partials/get-started/get-started.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ sed -i s_^app.get_//app.get_ app.js
3030
wget https://raw.github.com/mchapman/forms-angular/$branch/app/partials/get-started/index.html -O public/index.html
3131
wget https://raw.github.com/mchapman/forms-angular/$branch/app/partials/get-started/myapp.js -O public/myapp.js
3232
if [ $framework = "bs3" ]; then
33-
# use the correct css
34-
sed -i.bak s_forms-angular-bs2.css_forms-angular-bs3.css_ public/index.html
35-
# set the bs3 option
36-
sed -i.bak "s_//uncomment to use Bootstrap 3--__" public/myapp.js
33+
# upgrade to bootstrap 3
34+
cd public
35+
bower install bootstrap#3.1.1 --allow-root
36+
# use the correct css
37+
sed -i.bak s_forms-angular-bs2.css_forms-angular-bs3.css_ index.html
38+
# set the bs3 option
39+
sed -i.bak "s_//uncomment to use Bootstrap 3--__" myapp.js
40+
cd ..
3741
fi
3842
if [ $2 ]; then
3943
sed -i.bak "s/var formsAngular = require('forms-angular');/var formsAngular = require('forms-angular-test');/" app.js

‎app/partials/get-started/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<![endif]-->
3737

3838
<!--forms-angular stuff-->
39-
<link rel="stylesheet" href="/bower_components/forms-angular/forms-angular-bs2.css">
39+
<link rel="stylesheet" href="/bower_components/forms-angular/css/forms-angular-bs2.css">
4040
<script type="text/javascript" src="/bower_components/forms-angular/forms-angular.js"></script>
4141
<!--strip For testing a new branch - gets stripped out by expand-include -->
4242
<!--strip <link rel="stylesheet" href="https://rawgit.com/mchapman/forms-angular/"branch"/app/css/forms-angular-bs2.css">-->

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "forms-angular",
3-
"version": "0.2.6",
3+
"version": "0.2.7",
44
"homepage": "https://github.com/mchapman/forms-angular",
55
"description": "No nonsense forms for the MEAN stack",
66
"keywords": [

‎dist/partials/get-started.html

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,19 @@ <h3>Create</h3>
6969
cd myapp
7070
express
7171
npm install
72-
npm install forms-angular --save
72+
73+
if [ $1 ]; then
74+
npm install forms-angular-test --save
75+
else
76+
npm install forms-angular --save
77+
fi
7378
npm install mongoose --save
7479
cd public
75-
bower install forms-angular --allow-root
80+
if [ $1 ]; then
81+
bower install forms-angular#dev --allow-root
82+
else
83+
bower install forms-angular --allow-root
84+
fi
7685
cd ..</code></pre>
7786
</section>
7887
<section id="server-code" name="Server Code" affix-scroll>
@@ -131,18 +140,18 @@ <h3>Create your front end</h3>
131140
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/bootstrap/js/bootstrap-transition.js&quot;&gt;&lt;/script&gt;
132141
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/bootstrap/js/bootstrap-collapse.js&quot;&gt;&lt;/script&gt;
133142
&lt;link rel=&quot;stylesheet&quot; href=&quot;/bower_components/ng-grid/ng-grid.css&quot;&gt;
134-
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ng-grid/ng-grid-2.0.9.debug.js&quot;&gt;&lt;/script&gt;
143+
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ng-grid/ng-grid-2.0.7.debug.js&quot;&gt;&lt;/script&gt;
135144
&lt;link rel=&quot;stylesheet&quot; href=&quot;/bower_components/select2/select2.css&quot;&gt;
136145
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/angular-elastic/elastic.js&quot;&gt;&lt;/script&gt;
137146
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/select2/select2.js&quot;&gt;&lt;/script&gt;
138147
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ckeditor/ckeditor.js&quot;&gt;&lt;/script&gt;
139-
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ng-ckeditor/ng-ckeditor.src.js&quot;&gt;&lt;/script&gt;
148+
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/ng-ckeditor/ng-ckeditor.js&quot;&gt;&lt;/script&gt;
140149
&lt;!--[if lt IE 9]&gt;
141150
&lt;script src=&quot;/bower_components/html5shiv-dist/html5shiv.js&quot;&gt;&lt;/script&gt;
142151
&lt;![endif]--&gt;
143152

144153
&lt;!--forms-angular stuff--&gt;
145-
&lt;link rel=&quot;stylesheet&quot; href=&quot;/bower_components/forms-angular/forms-angular-bs2.css&quot;&gt;
154+
&lt;link rel=&quot;stylesheet&quot; href=&quot;/bower_components/forms-angular/css/forms-angular-bs2.css&quot;&gt;
146155
&lt;script type=&quot;text/javascript&quot; src=&quot;/bower_components/forms-angular/forms-angular.js&quot;&gt;&lt;/script&gt;
147156
&lt;script src=&quot;/myapp.js&quot;&gt;&lt;/script&gt;
148157
&lt;style type=&quot;text/css&quot; media=&quot;all&quot;&gt;

‎npm-build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"author": "Mark Chapman <support@reallycare.org>",
44
"description": "A form builder that sits on top of Angular.js, Twitter Bootstrap, jQuery UI, Angular-UI, Express and Mongoose. Opinionated or what?",
55
"homepage": "http://forms-angular.org",
6-
"version": "0.2.6",
6+
"version": "0.2.7",
77
"engines": {
88
"node": "0.10.x",
99
"npm": "1.x"

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"author": "Mark Chapman <support@reallycare.org>",
44
"description": "A form builder that sits on top of Angular.js, Twitter Bootstrap, jQuery UI, Angular-UI, Express and Mongoose. Opinionated or what?",
55
"homepage": "http://forms-angular.org",
6-
"version": "0.2.6",
6+
"version": "0.2.7",
77
"engines": {
88
"node": "0.10.x",
99
"npm": "1.x"

0 commit comments

Comments
 (0)