Skip to content

Commit 489f304

Browse files
modularcodermodularcoder
authored
Merge pull request #115 from df2/upgrade-bootstrap-to-4.3.1
Update bootstrap version
2 parents 8eba3bd + 7968dec commit 489f304

File tree

9 files changed

+34
-20
lines changed

9 files changed

+34
-20
lines changed

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"homepage": "https://github.com/modularcode/modular-admin-html",
1515
"dependencies": {
1616
"animate.css": "^3.5.2",
17-
"bootstrap": "^4.0.0",
17+
"bootstrap": "^4.3.1",
1818
"dropzone": "^5.3.0",
1919
"font-awesome": "^4.7.0",
2020
"jquery": "^3.0.0",

Diff for: ‎src/app/charts/charts-flot/charts-flot-page.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pagename: charts-flot
3737
<div class="card-block">
3838
<div class="card-title-block">
3939
<h3 class="title">
40-
Line Cahrt Example
40+
Line Chart Example
4141
</h3>
4242
</div>
4343

Diff for: ‎src/app/dashboard/stats/stats.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</h4>
88
<p class="title-description">
99
Website metrics for
10-
<a href="http://modularteam.github.io/modularity-free-admin-dashboard-theme-html/">
10+
<a href="https://modularcode.io/modular-admin-html/">
1111
your awesome project
1212
</a>
1313
</p>

Diff for: ‎src/app/forms/checboxes/checboxes.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="card card-block">
22
<div class="title-block">
33
<h3 class="title">
4-
Checkboxe Types
4+
Checkbox Types
55
</h3>
66
</div>
77
<form role="form">

Diff for: ‎src/app/forms/input-groups/input-groups.hbs

+21-7
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,48 @@
88
<div class="form-group">
99
<label class="control-label">Input Text</label>
1010
<div class="input-group">
11-
<span class="input-group-addon">@</span>
11+
<span class="input-group-prepend">
12+
<span class="input-group-text">@</span>
13+
</span>
1214
<input type="text" class="form-control" placeholder="Some text here">
1315
</div>
1416
<div class="input-group">
1517
<input type="text" class="form-control" placeholder="Some text here">
16-
<span class="input-group-addon">.00</span>
18+
<span class="input-group-append">
19+
<span class="input-group-text">.00</span>
20+
</span>
1721
</div>
1822

1923
<div class="input-group">
20-
<span class="input-group-addon">$</span>
24+
<span class="input-group-prepend">
25+
<span class="input-group-text">$</span>
26+
</span>
2127
<input type="text" class="form-control" placeholder="Some text here">
22-
<span class="input-group-addon">.00</span>
28+
<span class="input-group-append">
29+
<span class="input-group-text">.00</span>
30+
</span>
2331
</div>
2432
</div>
2533
<div class="form-group">
2634
<label class="control-label">Input Sizing</label>
2735
<div class="input-group input-group-lg">
28-
<span class="input-group-addon">@</span>
36+
<span class="input-group-prepend">
37+
<span class="input-group-text">@</span>
38+
</span>
2939
<input type="text" class="form-control" placeholder="Username">
3040
</div>
3141

3242
<div class="input-group">
33-
<span class="input-group-addon">@</span>
43+
<span class="input-group-prepend">
44+
<span class="input-group-text">@</span>
45+
</span>
3446
<input type="text" class="form-control" placeholder="Username">
3547
</div>
3648

3749
<div class="input-group input-group-sm">
38-
<span class="input-group-addon">@</span>
50+
<span class="input-group-prepend">
51+
<span class="input-group-text">@</span>
52+
</span>
3953
<input type="text" class="form-control" placeholder="Username">
4054
</div>
4155
</div>

Diff for: ‎src/app/forms/using-grid-form/using-grid-form.hbs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
</div>
77
<form>
88
<div class="form-group row">
9-
<label for="inputEmail3" class="col-sm-2 form-control-label">Email</label>
10-
<div class="col-sm-10">
9+
<label for="inputEmail3" class="col-sm-3 form-control-label">Email</label>
10+
<div class="col-sm-9">
1111
<input type="email" class="form-control" id="inputEmail3" placeholder="Email">
1212
</div>
1313
</div>
1414
<div class="form-group row">
15-
<label for="inputPassword3" class="col-sm-2 form-control-label">Password</label>
16-
<div class="col-sm-10">
15+
<label for="inputPassword3" class="col-sm-3 form-control-label">Password</label>
16+
<div class="col-sm-9">
1717
<input type="password" class="form-control" id="inputPassword3" placeholder="Password">
1818
</div>
1919
</div>
2020
<div class="form-group row">
21-
<div class="col-sm-offset-2 col-sm-10">
21+
<div class="col-sm-offset-3 col-sm-9">
2222
<button type="submit" class="btn btn-success">Sign in</button>
2323
</div>
2424
</div>

Diff for: ‎src/auth/login/login-page.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ themeTitle: ModularAdmin
3333
<button type="submit" class="btn btn-block btn-primary">Login</button>
3434
</div>
3535
<div class="form-group">
36-
<p class="text-muted text-center">Do not have an account? <a href="signup.html">Sign Up!</a></p>
36+
<p class="text-muted text-center">Do not have an account? <a href="signup.html">Sign Up</a></p>
3737
</div>
3838
</form>
3939
</div>

Diff for: ‎src/auth/reset/reset-page.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ themeTitle: ModularAdmin
2222
<button type="submit" class="btn btn-block btn-primary">Reset</button>
2323
</div>
2424
<div class="form-group clearfix">
25-
<a class="pull-left" href="login.html">return to Login</a>
26-
<a class="pull-right" href="signup.html">Sign Up!</a>
25+
<a class="pull-left" href="login.html">Return to Login</a>
26+
<a class="pull-right" href="signup.html">Sign Up</a>
2727
</div>
2828
</form>
2929
</div>

Diff for: ‎src/auth/signup/signup-page.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ themeTitle: ModularAdmin
5555
<button type="submit" class="btn btn-block btn-primary">Sign Up</button>
5656
</div>
5757
<div class="form-group">
58-
<p class="text-muted text-center">Already have an account? <a href="login.html">Login!</a></p>
58+
<p class="text-muted text-center">Already have an account? <a href="login.html">Login</a></p>
5959
</div>
6060
</form>
6161
</div>

0 commit comments

Comments
 (0)