Skip to content

Commit 0d63790

Browse files
mrholekmrholek
committed
update to latest version of bootstrap
1 parent f1cbc8f commit 0d63790

16 files changed

+442
-552
lines changed

‎Static_Full_Project_GULP/blank.html

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
<html lang="en">
1010

1111
<head>
12-
1312
<meta charset="utf-8">
1413
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1514
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
1615
<meta name="description" content="CoreUI - Open Source Bootstrap Admin Template">
1716
<meta name="author" content="Łukasz Holeczek">
1817
<meta name="keyword" content="Bootstrap,Admin,Template,Open,Source,AngularJS,Angular,Angular2,Angular 2,Angular4,Angular 4,jQuery,CSS,HTML,RWD,Dashboard,React,React.js,Vue,Vue.js">
1918
<link rel="shortcut icon" href="img/favicon.png">
20-
2119
<title>CoreUI - Open Source Bootstrap Admin Template</title>
2220

2321
<!-- Icons -->
@@ -26,7 +24,6 @@
2624

2725
<!-- Main styles for this application -->
2826
<link href="css/style.css" rel="stylesheet">
29-
3027
</head>
3128

3229
<!-- BODY options, add following classes to body to change options
@@ -46,20 +43,21 @@
4643
2. '.aside-menu-hidden' - Hidden Aside Menu
4744
3. '.aside-menu-off-canvas' - Off Canvas Aside Menu
4845
46+
// Breadcrumb options
47+
1. '.breadcrumb-fixed' - Fixed Breadcrumb
48+
4949
// Footer options
50-
1. '.footer-fixed' - Fixed footer
50+
1. '.footer-fixed' - Fixed footer
5151
5252
-->
5353

5454
<body class="app header-fixed sidebar-fixed aside-menu-fixed aside-menu-hidden">
5555
<header class="app-header navbar">
5656
<button class="navbar-toggler mobile-sidebar-toggler d-lg-none" type="button">☰</button>
5757
<a class="navbar-brand" href="#"></a>
58-
<ul class="nav navbar-nav d-md-down-none">
59-
<li class="nav-item">
60-
<a class="nav-link navbar-toggler sidebar-toggler" href="#">☰</a>
61-
</li>
58+
<button class="navbar-toggler sidebar-toggler d-md-down-none" type="button">☰</button>
6259

60+
<ul class="nav navbar-nav d-md-down-none">
6361
<li class="nav-item px-3">
6462
<a class="nav-link" href="#">Dashboard</a>
6563
</li>
@@ -86,20 +84,16 @@
8684
<span class="d-md-down-none">admin</span>
8785
</a>
8886
<div class="dropdown-menu dropdown-menu-right">
89-
9087
<div class="dropdown-header text-center">
9188
<strong>Account</strong>
9289
</div>
93-
9490
<a class="dropdown-item" href="#"><i class="fa fa-bell-o"></i> Updates<span class="badge badge-info">42</span></a>
9591
<a class="dropdown-item" href="#"><i class="fa fa-envelope-o"></i> Messages<span class="badge badge-success">42</span></a>
9692
<a class="dropdown-item" href="#"><i class="fa fa-tasks"></i> Tasks<span class="badge badge-danger">42</span></a>
9793
<a class="dropdown-item" href="#"><i class="fa fa-comments"></i> Comments<span class="badge badge-warning">42</span></a>
98-
9994
<div class="dropdown-header text-center">
10095
<strong>Settings</strong>
10196
</div>
102-
10397
<a class="dropdown-item" href="#"><i class="fa fa-user"></i> Profile</a>
10498
<a class="dropdown-item" href="#"><i class="fa fa-wrench"></i> Settings</a>
10599
<a class="dropdown-item" href="#"><i class="fa fa-usd"></i> Payments<span class="badge badge-default">42</span></a>
@@ -109,19 +103,17 @@
109103
<a class="dropdown-item" href="#"><i class="fa fa-lock"></i> Logout</a>
110104
</div>
111105
</li>
112-
<li class="nav-item d-md-down-none">
113-
<a class="nav-link navbar-toggler aside-menu-toggler" href="#">☰</a>
114-
</li>
115-
106+
<button class="navbar-toggler aside-menu-toggler d-md-down-none" type="button">☰</button>
116107
</ul>
108+
117109
</header>
118110

119111
<div class="app-body">
120112
<div class="sidebar">
121113
<nav class="sidebar-nav">
122114
<ul class="nav">
123115
<li class="nav-item">
124-
<a class="nav-link" href="index.html"><i class="icon-speedometer"></i> Dashboard <span class="badge badge-info">NEW</span></a>
116+
<a class="nav-link" href="index.html"><i class="icon-speedometer"></i> Dashboard <span class="badge badge-primary">NEW</span></a>
125117
</li>
126118

127119
<li class="nav-title">
@@ -168,7 +160,7 @@
168160
</ul>
169161
</li>
170162
<li class="nav-item">
171-
<a class="nav-link" href="widgets.html"><i class="icon-calculator"></i> Widgets <span class="badge badge-info">NEW</span></a>
163+
<a class="nav-link" href="widgets.html"><i class="icon-calculator"></i> Widgets <span class="badge badge-primary">NEW</span></a>
172164
</li>
173165
<li class="nav-item">
174166
<a class="nav-link" href="charts.html"><i class="icon-pie-chart"></i> Charts</a>
@@ -211,10 +203,10 @@
211203

212204
<!-- Breadcrumb Menu-->
213205
<li class="breadcrumb-menu d-md-down-none">
214-
<div class="btn-group" role="group" aria-label="Button group with nested dropdown">
215-
<a class="btn btn-secondary" href="#"><i class="icon-speech"></i></a>
216-
<a class="btn btn-secondary" href="./"><i class="icon-graph"></i> &nbsp;Dashboard</a>
217-
<a class="btn btn-secondary" href="#"><i class="icon-settings"></i> &nbsp;Settings</a>
206+
<div class="btn-group" role="group" aria-label="Button group">
207+
<a class="btn" href="#"><i class="icon-speech"></i></a>
208+
<a class="btn" href="./"><i class="icon-graph"></i> &nbsp;Dashboard</a>
209+
<a class="btn" href="#"><i class="icon-settings"></i> &nbsp;Settings</a>
218210
</div>
219211
</li>
220212
</ol>
@@ -245,7 +237,7 @@
245237
<!-- Tab panes -->
246238
<div class="tab-content">
247239
<div class="tab-pane active" id="timeline" role="tabpanel">
248-
<div class="callout m-0 py-2 text-muted text-center bg-faded text-uppercase">
240+
<div class="callout m-0 py-2 text-muted text-center bg-light text-uppercase">
249241
<small><b>Today</b>
250242
</small>
251243
</div>
@@ -272,7 +264,7 @@
272264
<small class="text-muted"><i class="icon-social-skype"></i>&nbsp; On-line</small>
273265
</div>
274266
<hr class="transparent mx-3 my-0">
275-
<div class="callout m-0 py-2 text-muted text-center bg-faded text-uppercase">
267+
<div class="callout m-0 py-2 text-muted text-center bg-light text-uppercase">
276268
<small><b>Tomorrow</b>
277269
</small>
278270
</div>

‎Static_Full_Project_GULP/charts.html

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
<html lang="en">
1010

1111
<head>
12-
1312
<meta charset="utf-8">
1413
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1514
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
1615
<meta name="description" content="CoreUI - Open Source Bootstrap Admin Template">
1716
<meta name="author" content="Łukasz Holeczek">
1817
<meta name="keyword" content="Bootstrap,Admin,Template,Open,Source,AngularJS,Angular,Angular2,Angular 2,Angular4,Angular 4,jQuery,CSS,HTML,RWD,Dashboard,React,React.js,Vue,Vue.js">
1918
<link rel="shortcut icon" href="img/favicon.png">
20-
2119
<title>CoreUI - Open Source Bootstrap Admin Template</title>
2220

2321
<!-- Icons -->
@@ -26,7 +24,6 @@
2624

2725
<!-- Main styles for this application -->
2826
<link href="css/style.css" rel="stylesheet">
29-
3027
</head>
3128

3229
<!-- BODY options, add following classes to body to change options
@@ -46,20 +43,21 @@
4643
2. '.aside-menu-hidden' - Hidden Aside Menu
4744
3. '.aside-menu-off-canvas' - Off Canvas Aside Menu
4845
46+
// Breadcrumb options
47+
1. '.breadcrumb-fixed' - Fixed Breadcrumb
48+
4949
// Footer options
50-
1. '.footer-fixed' - Fixed footer
50+
1. '.footer-fixed' - Fixed footer
5151
5252
-->
5353

5454
<body class="app header-fixed sidebar-fixed aside-menu-fixed aside-menu-hidden">
5555
<header class="app-header navbar">
5656
<button class="navbar-toggler mobile-sidebar-toggler d-lg-none" type="button">☰</button>
5757
<a class="navbar-brand" href="#"></a>
58-
<ul class="nav navbar-nav d-md-down-none">
59-
<li class="nav-item">
60-
<a class="nav-link navbar-toggler sidebar-toggler" href="#">☰</a>
61-
</li>
58+
<button class="navbar-toggler sidebar-toggler d-md-down-none" type="button">☰</button>
6259

60+
<ul class="nav navbar-nav d-md-down-none">
6361
<li class="nav-item px-3">
6462
<a class="nav-link" href="#">Dashboard</a>
6563
</li>
@@ -86,20 +84,16 @@
8684
<span class="d-md-down-none">admin</span>
8785
</a>
8886
<div class="dropdown-menu dropdown-menu-right">
89-
9087
<div class="dropdown-header text-center">
9188
<strong>Account</strong>
9289
</div>
93-
9490
<a class="dropdown-item" href="#"><i class="fa fa-bell-o"></i> Updates<span class="badge badge-info">42</span></a>
9591
<a class="dropdown-item" href="#"><i class="fa fa-envelope-o"></i> Messages<span class="badge badge-success">42</span></a>
9692
<a class="dropdown-item" href="#"><i class="fa fa-tasks"></i> Tasks<span class="badge badge-danger">42</span></a>
9793
<a class="dropdown-item" href="#"><i class="fa fa-comments"></i> Comments<span class="badge badge-warning">42</span></a>
98-
9994
<div class="dropdown-header text-center">
10095
<strong>Settings</strong>
10196
</div>
102-
10397
<a class="dropdown-item" href="#"><i class="fa fa-user"></i> Profile</a>
10498
<a class="dropdown-item" href="#"><i class="fa fa-wrench"></i> Settings</a>
10599
<a class="dropdown-item" href="#"><i class="fa fa-usd"></i> Payments<span class="badge badge-default">42</span></a>
@@ -109,19 +103,17 @@
109103
<a class="dropdown-item" href="#"><i class="fa fa-lock"></i> Logout</a>
110104
</div>
111105
</li>
112-
<li class="nav-item d-md-down-none">
113-
<a class="nav-link navbar-toggler aside-menu-toggler" href="#">☰</a>
114-
</li>
115-
106+
<button class="navbar-toggler aside-menu-toggler d-md-down-none" type="button">☰</button>
116107
</ul>
108+
117109
</header>
118110

119111
<div class="app-body">
120112
<div class="sidebar">
121113
<nav class="sidebar-nav">
122114
<ul class="nav">
123115
<li class="nav-item">
124-
<a class="nav-link" href="index.html"><i class="icon-speedometer"></i> Dashboard <span class="badge badge-info">NEW</span></a>
116+
<a class="nav-link" href="index.html"><i class="icon-speedometer"></i> Dashboard <span class="badge badge-primary">NEW</span></a>
125117
</li>
126118

127119
<li class="nav-title">
@@ -168,7 +160,7 @@
168160
</ul>
169161
</li>
170162
<li class="nav-item">
171-
<a class="nav-link" href="widgets.html"><i class="icon-calculator"></i> Widgets <span class="badge badge-info">NEW</span></a>
163+
<a class="nav-link" href="widgets.html"><i class="icon-calculator"></i> Widgets <span class="badge badge-primary">NEW</span></a>
172164
</li>
173165
<li class="nav-item">
174166
<a class="nav-link" href="charts.html"><i class="icon-pie-chart"></i> Charts</a>
@@ -211,10 +203,10 @@
211203

212204
<!-- Breadcrumb Menu-->
213205
<li class="breadcrumb-menu d-md-down-none">
214-
<div class="btn-group" role="group" aria-label="Button group with nested dropdown">
215-
<a class="btn btn-secondary" href="#"><i class="icon-speech"></i></a>
216-
<a class="btn btn-secondary" href="./"><i class="icon-graph"></i> &nbsp;Dashboard</a>
217-
<a class="btn btn-secondary" href="#"><i class="icon-settings"></i> &nbsp;Settings</a>
206+
<div class="btn-group" role="group" aria-label="Button group">
207+
<a class="btn" href="#"><i class="icon-speech"></i></a>
208+
<a class="btn" href="./"><i class="icon-graph"></i> &nbsp;Dashboard</a>
209+
<a class="btn" href="#"><i class="icon-settings"></i> &nbsp;Settings</a>
218210
</div>
219211
</li>
220212
</ol>
@@ -235,7 +227,7 @@
235227
</a>
236228
</div>
237229
</div>
238-
<div class="card-block">
230+
<div class="card-body">
239231
<div class="chart-wrapper">
240232
<canvas id="canvas-1"></canvas>
241233
</div>
@@ -250,7 +242,7 @@
250242
</a>
251243
</div>
252244
</div>
253-
<div class="card-block">
245+
<div class="card-body">
254246
<div class="chart-wrapper">
255247
<canvas id="canvas-2"></canvas>
256248
</div>
@@ -265,7 +257,7 @@
265257
</a>
266258
</div>
267259
</div>
268-
<div class="card-block">
260+
<div class="card-body">
269261
<div class="chart-wrapper">
270262
<canvas id="canvas-3"></canvas>
271263
</div>
@@ -280,7 +272,7 @@
280272
</a>
281273
</div>
282274
</div>
283-
<div class="card-block">
275+
<div class="card-body">
284276
<div class="chart-wrapper">
285277
<canvas id="canvas-4"></canvas>
286278
</div>
@@ -295,7 +287,7 @@
295287
</a>
296288
</div>
297289
</div>
298-
<div class="card-block">
290+
<div class="card-body">
299291
<div class="chart-wrapper">
300292
<canvas id="canvas-5"></canvas>
301293
</div>
@@ -310,7 +302,7 @@
310302
</a>
311303
</div>
312304
</div>
313-
<div class="card-block">
305+
<div class="card-body">
314306
<div class="chart-wrapper">
315307
<canvas id="canvas-6"></canvas>
316308
</div>
@@ -339,7 +331,7 @@
339331
<!-- Tab panes -->
340332
<div class="tab-content">
341333
<div class="tab-pane active" id="timeline" role="tabpanel">
342-
<div class="callout m-0 py-2 text-muted text-center bg-faded text-uppercase">
334+
<div class="callout m-0 py-2 text-muted text-center bg-light text-uppercase">
343335
<small><b>Today</b>
344336
</small>
345337
</div>
@@ -366,7 +358,7 @@
366358
<small class="text-muted"><i class="icon-social-skype"></i>&nbsp; On-line</small>
367359
</div>
368360
<hr class="transparent mx-3 my-0">
369-
<div class="callout m-0 py-2 text-muted text-center bg-faded text-uppercase">
361+
<div class="callout m-0 py-2 text-muted text-center bg-light text-uppercase">
370362
<small><b>Tomorrow</b>
371363
</small>
372364
</div>

0 commit comments

Comments
 (0)