Skip to content

Commit c3caa0e

Browse files
mrholekmrholek
committed
update to latest version of bootstrap
1 parent 71c93a2 commit c3caa0e

16 files changed

+239
-240
lines changed

‎Angular4_CLI_Full_Project/src/app/chartjs/chartjs.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</a>
1010
</div>
1111
</div>
12-
<div class="card-block">
12+
<div class="card-body">
1313
<div class="chart-wrapper">
1414
<canvas baseChart class="chart"
1515
[datasets]="lineChartData"
@@ -32,7 +32,7 @@
3232
</a>
3333
</div>
3434
</div>
35-
<div class="card-block">
35+
<div class="card-body">
3636
<div class="chart-wrapper">
3737
<canvas baseChart class="chart"
3838
[datasets]="barChartData"
@@ -54,7 +54,7 @@
5454
</a>
5555
</div>
5656
</div>
57-
<div class="card-block">
57+
<div class="card-body">
5858
<div class="chart-wrapper">
5959
<canvas baseChart class="chart"
6060
[data]="doughnutChartData"
@@ -74,7 +74,7 @@
7474
</a>
7575
</div>
7676
</div>
77-
<div class="card-block">
77+
<div class="card-body">
7878
<div class="chart-wrapper">
7979
<canvas baseChart class="chart"
8080
[datasets]="radarChartData"
@@ -94,7 +94,7 @@
9494
</a>
9595
</div>
9696
</div>
97-
<div class="card-block">
97+
<div class="card-body">
9898
<div class="chart-wrapper">
9999
<canvas baseChart class="chart"
100100
[data]="pieChartData"
@@ -114,7 +114,7 @@
114114
</a>
115115
</div>
116116
</div>
117-
<div class="card-block">
117+
<div class="card-body">
118118
<div class="chart-wrapper">
119119
<canvas baseChart class="chart"
120120
[data]="polarAreaChartData"

‎Angular4_CLI_Full_Project/src/app/components/buttons.component.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="card-header">
66
<strong>Options</strong>
77
</div>
8-
<div class="card-block">
8+
<div class="card-body">
99
<button type="button" class="btn btn-primary">Primary</button>
1010
<button type="button" class="btn btn-secondary">Secondary</button>
1111
<button type="button" class="btn btn-success">Success</button>
@@ -18,7 +18,7 @@
1818
<div class="card-header">
1919
<strong>With Icons</strong>
2020
</div>
21-
<div class="card-block">
21+
<div class="card-body">
2222
<button type="button" class="btn btn-primary"><i class="fa fa-star"></i>&nbsp; Primary</button>
2323
<button type="button" class="btn btn-secondary"><i class="fa fa-lightbulb-o"></i>&nbsp; Secondary</button>
2424
<button type="button" class="btn btn-success"><i class="fa fa-magic"></i>&nbsp; Success</button>
@@ -34,7 +34,7 @@
3434
<code>.btn-lg</code>
3535
</small>
3636
</div>
37-
<div class="card-block">
37+
<div class="card-body">
3838
<button type="button" class="btn btn-primary btn-lg">Primary</button>
3939
<button type="button" class="btn btn-secondary btn-lg">Secondary</button>
4040
<button type="button" class="btn btn-success btn-lg">Success</button>
@@ -51,7 +51,7 @@
5151
<code>.btn-sm</code>
5252
</small>
5353
</div>
54-
<div class="card-block">
54+
<div class="card-body">
5555
<button type="button" class="btn btn-primary btn-sm">Primary</button>
5656
<button type="button" class="btn btn-secondary btn-sm">Secondary</button>
5757
<button type="button" class="btn btn-success btn-sm">Success</button>
@@ -68,7 +68,7 @@
6868
<code>disabled="disabled"</code>
6969
</small>
7070
</div>
71-
<div class="card-block">
71+
<div class="card-body">
7272
<button type="button" class="btn btn-primary" disabled="disabled">Primary</button>
7373
<button type="button" class="btn btn-secondary" disabled="disabled">Secondary</button>
7474
<button type="button" class="btn btn-success" disabled="disabled">Success</button>
@@ -85,7 +85,7 @@
8585
<code>.active</code>
8686
</small>
8787
</div>
88-
<div class="card-block">
88+
<div class="card-body">
8989
<button type="button" class="btn btn-primary active">Primary</button>
9090
<button type="button" class="btn btn-secondary active">Secondary</button>
9191
<button type="button" class="btn btn-success active">Success</button>
@@ -102,7 +102,7 @@
102102
<code>.btn-block</code>
103103
</small>
104104
</div>
105-
<div class="card-block">
105+
<div class="card-body">
106106
<button type="button" class="btn btn-secondary btn-lg btn-block">Block level button</button>
107107
<button type="button" class="btn btn-primary btn-lg btn-block">Block level button</button>
108108
<button type="button" class="btn btn-success btn-lg btn-block">Block level button</button>
@@ -119,7 +119,7 @@
119119
<div class="card-header">
120120
<strong>Options</strong>
121121
</div>
122-
<div class="card-block">
122+
<div class="card-body">
123123
<!-- Provides extra visual weight and identifies the primary action in a set of buttons -->
124124
<button type="button" class="btn btn-outline-primary">Primary</button>
125125
<!-- Secondary, outline button -->
@@ -136,7 +136,7 @@
136136
<div class="card-header">
137137
<strong>With Icons</strong>
138138
</div>
139-
<div class="card-block">
139+
<div class="card-body">
140140
<button type="button" class="btn btn-outline-primary"><i class="fa fa-star"></i>&nbsp; Primary</button>
141141
<button type="button" class="btn btn-outline-secondary"><i class="fa fa-lightbulb-o"></i>&nbsp; Secondary</button>
142142
<button type="button" class="btn btn-outline-success"><i class="fa fa-magic"></i>&nbsp; Success</button>
@@ -151,7 +151,7 @@
151151
<code>.btn-lg</code>
152152
</small>
153153
</div>
154-
<div class="card-block">
154+
<div class="card-body">
155155
<button type="button" class="btn btn-outline-primary btn-lg">Primary</button>
156156
<button type="button" class="btn btn-outline-secondary btn-lg">Secondary</button>
157157
<button type="button" class="btn btn-outline-success btn-lg">Success</button>
@@ -167,7 +167,7 @@
167167
<code>.btn-sm</code>
168168
</small>
169169
</div>
170-
<div class="card-block">
170+
<div class="card-body">
171171
<button type="button" class="btn btn-outline-primary btn-sm">Primary</button>
172172
<button type="button" class="btn btn-outline-secondary btn-sm">Secondary</button>
173173
<button type="button" class="btn btn-outline-success btn-sm">Success</button>
@@ -183,7 +183,7 @@
183183
<code>disabled="disabled"</code>
184184
</small>
185185
</div>
186-
<div class="card-block">
186+
<div class="card-body">
187187
<button type="button" class="btn btn-outline-primary" disabled="disabled">Primary</button>
188188
<button type="button" class="btn btn-outline-secondary" disabled="disabled">Secondary</button>
189189
<button type="button" class="btn btn-success" disabled="disabled">Success</button>
@@ -199,7 +199,7 @@
199199
<code>.active</code>
200200
</small>
201201
</div>
202-
<div class="card-block">
202+
<div class="card-body">
203203
<button type="button" class="btn btn-outline-primary active">Primary</button>
204204
<button type="button" class="btn btn-outline-secondary active">Secondary</button>
205205
<button type="button" class="btn btn-outline-success active">Success</button>
@@ -215,7 +215,7 @@
215215
<code>.btn-block</code>
216216
</small>
217217
</div>
218-
<div class="card-block">
218+
<div class="card-body">
219219
<button type="button" class="btn btn-outline-secondary btn-lg btn-block">Block level button</button>
220220
<button type="button" class="btn btn-outline-primary btn-lg btn-block">Block level button</button>
221221
<button type="button" class="btn btn-outline-success btn-lg btn-block">Block level button</button>

0 commit comments

Comments
 (0)