Skip to content

Commit 35a5402

Browse files
author
Robert Yokota
committed
Upgrade to Bootstrap 3
1 parent d579732 commit 35a5402

File tree

5 files changed

+40
-33
lines changed

5 files changed

+40
-33
lines changed

‎app/templates/_bower.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
"name": "<%= _.camelize(baseName) %>",
33
"version": "0.0.0",
44
"dependencies": {
5-
"angular-bootstrap": "~0.7.0",
6-
"angular-resource": "~1.2.6",
7-
"angular-route": "~1.2.6",
5+
"angular-bootstrap": "~0.10.0",
6+
"angular-resource": "~1.2.13",
7+
"angular-route": "~1.2.13",
88
"angular-ui-date": "~0.0.3",
9-
"angular": "~1.2.6",
10-
"bootstrap-css": "~2.3.2",
11-
"flat-ui-official": "~2.0.0",
12-
"jquery": "~2.0.3",
9+
"angular": "~1.2.13",
10+
"bootstrap-css": "~3.0.0",
11+
"jquery": "~2.1.0",
1312
"lodash": "~2.4.1"
1413
},
1514
"devDependencies": {
16-
"angular-mocks": "~1.2.6",
17-
"angular-scenario": "~1.2.6"
15+
"angular-mocks": "~1.2.13",
16+
"angular-scenario": "~1.2.13"
1817
}
1918
}

‎app/templates/public/_index.html

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,37 @@
77
<title><%= _.capitalize(baseName) %></title>
88
<link href="lib/bootstrap-css/css/bootstrap.css" rel="stylesheet">
99
<link href="lib/bootstrap-css/css/bootstrap-responsive.css" rel="stylesheet">
10-
<link href="lib/flat-ui-official/css/flat-ui.css" rel="stylesheet">
1110
<link href="lib/jquery-ui/themes/smoothness/jquery-ui.css" rel="stylesheet"/>
1211
<link href="css/app.css" rel="stylesheet">
1312
</head>
1413
<body>
15-
<div class="container-fluid">
16-
<div class="row-fluid">
17-
<div class="navbar navbar-inverse">
18-
<div class="navbar-inner">
19-
<div class="container-fluid">
20-
<a class="brand" href="#"><%= _.capitalize(baseName) %></a>
21-
<ul class="nav">
22-
<% _.each(entities, function (entity) { %>
23-
<li>
24-
<a href="/#/<%= pluralize(entity.name) %>"><%= _.capitalize(pluralize(entity.name)) %></a>
25-
</li>
26-
<% }); %>
27-
</ul>
28-
</div>
29-
</div>
30-
</div>
31-
</div>
32-
</div>
33-
<div class="container-fluid" ng-view></div>
14+
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
15+
<div class="container">
16+
<div class="navbar-header">
17+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
18+
<span class="sr-only">Toggle navigation</span>
19+
<span class="icon-bar"></span>
20+
<span class="icon-bar"></span>
21+
<span class="icon-bar"></span>
22+
</button>
23+
<a class="navbar-brand" href="#">Myapp</a>
24+
</div>
25+
26+
<!-- Collect the nav links, forms, and other content for toggling -->
27+
<div class="collapse navbar-collapse navbar-ex1-collapse">
28+
<ul class="nav navbar-nav">
29+
<% _.each(entities, function (entity) { %>
30+
<li>
31+
<a href="/#/<%= pluralize(entity.name) %>"><%= _.capitalize(pluralize(entity.name)) %></a>
32+
</li>
33+
<% }); %>
34+
</ul>
35+
</div>
36+
<!-- /.navbar-collapse -->
37+
</div>
38+
<!-- /.container -->
39+
</nav>
40+
<div class="container" ng-view></div>
3441
<script src="lib/jquery/jquery.js"></script>
3542
<script src="lib/jquery-ui/ui/jquery-ui.js"></script>
3643
<script src="lib/lodash/dist/lodash.js"></script>

‎app/templates/public/css/app.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
body {
2+
margin-top: 60px;
23
padding: 10px;
34
background-color: #ECF0F1;
45
}

‎entity/templates/public/views/entity/_entities.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ <h4 class="modal-title" id="my<%= _.capitalize(name) %>Label">Create or edit a <
4343
<span class="error" ng-show="form.<%= attr.attrName %>.$error.min">Must be greater than or equal to <%= attr.min %>.</span>
4444
<span class="error" ng-show="form.<%= attr.attrName %>.$error.max">Must be less than or equal to <%= attr.max %>.</span><%
4545
} else if (attr.attrType === "Boolean") { %>
46-
<input type="checkbox" class="form-control" name="<%= attr.attrName %>"
46+
<input type="checkbox" name="<%= attr.attrName %>"
4747
ng-model="<%= name %>.<%= attr.attrName %>" ng-required="<%= attr.required %>"/><%
4848
} else if (attr.attrType === "Date") { %>
4949
<input type="text" class="form-control" name="<%= attr.attrName %>" ui-date="<%= attr.attrName %>DateOptions" ui-date-format="yy-mm-dd"
5050
ng-model="<%= name %>.<%= attr.attrName %>" ng-required="<%= attr.required %>"/><%
5151
} else if (attr.attrType === "Enum") {
5252
_.each(attr.enumValues, function (value) { %>
53-
<input type="radio" class="form-control" name="<%= attr.attrName %>" value="<%= value %>"
54-
ng-model="<%= name %>.<%= attr.attrName %>" ng-required="<%= attr.required %>"/> <%= value %> <br/><% })} %>
53+
<label class="radio"><input type="radio" name="<%= attr.attrName %>" value="<%= value %>"
54+
ng-model="<%= name %>.<%= attr.attrName %>" ng-required="<%= attr.required %>"/> <%= value %> </label><% })} %>
5555
</div>
5656
<% }); %>
5757

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-angular-express-sequelize",
3-
"version": "0.1.5",
3+
"version": "0.1.6",
44
"description": "A Yeoman generator for AngularJS + Express + Sequelize",
55
"keywords": [
66
"yeoman-generator",

0 commit comments

Comments
 (0)