Skip to content

Commit 2c0995c

Browse files
accgitaccgit
authored
Merge pull request #12 from compostrap/bs-5
Bs 5
2 parents e678e26 + 3636d40 commit 2c0995c

15 files changed

+1187
-878
lines changed

‎demo/dark.gradient.html

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33

44
<head>
55
<meta charset="UTF-8">
@@ -17,16 +17,18 @@
1717

1818
<header>
1919
<nav class="navbar navbar-expand-md navbar-light bg-white fixed-top">
20+
<div class="container-fluid">
2021

21-
<!-- title -->
22-
<a class="navbar-brand" href="#"><i class="fab fa-bootstrap mr-1 text-danger"></i>
23-
<span class="text-danger">Bootstrap menu</span>
24-
</a>
22+
<!-- title -->
23+
<a class="navbar-brand" href="#"><i class="fab fa-bootstrap mr-1 text-danger"></i>
24+
<span class="text-danger">Bootstrap menu</span>
25+
</a>
2526

26-
<!-- sidebar toggle -->
27-
<button class="navbar-toggler btn btn-link border-0" type="button" id="sidebar" aria-label="Toggle navigation">
28-
<span class="navbar-toggler-icon"></span>
29-
</button>
27+
<!-- sidebar toggle -->
28+
<button class="navbar-toggler btn btn-link border-0" type="button" id="sidebar" aria-label="Toggle navigation">
29+
<span class="navbar-toggler-icon"></span>
30+
</button>
31+
</div>
3032
</nav>
3133
</header>
3234

@@ -145,10 +147,10 @@
145147
<li>
146148
<a href="#" class="list-link">
147149
<div class="clearfix">
148-
<div class="float-left"><span class="list-icon"><i class="far fa-bell"></i></span>Messages</div>
149-
<div class="float-right">
150-
<span class="badge badge-danger">New</span>
151-
<span class="badge badge-secondary">4</span>
150+
<div class="float-start"><span class="list-icon"><i class="far fa-bell"></i></span>Messages</div>
151+
<div class="float-end">
152+
<span class="badge bg-danger">New</span>
153+
<span class="badge bg-secondary">4</span>
152154
</div>
153155
</div>
154156
</a>
@@ -190,7 +192,6 @@
190192
<script src="../dist/js/sidebar.menu.js"></script>
191193
<script>
192194
$(function() {
193-
new Sidebar();
194195
new Nanobar().go(100);
195196
new PerfectScrollbar('.scrollbar', {
196197
wheelSpeed: 0.3

‎demo/dark.html

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33

44
<head>
55
<meta charset="UTF-8">
@@ -17,16 +17,18 @@
1717

1818
<header>
1919
<nav class="navbar navbar-expand-md navbar-light bg-white fixed-top">
20+
<div class="container-fluid">
2021

21-
<!-- title -->
22-
<a class="navbar-brand" href="#"><i class="fab fa-bootstrap mr-1 text-danger"></i>
23-
<span class="text-danger">Bootstrap menu</span>
24-
</a>
22+
<!-- title -->
23+
<a class="navbar-brand" href="#"><i class="fab fa-bootstrap mr-1 text-danger"></i>
24+
<span class="text-danger">Bootstrap menu</span>
25+
</a>
2526

26-
<!-- sidebar toggle -->
27-
<button class="navbar-toggler btn btn-link border-0" type="button" id="sidebar" aria-label="Toggle navigation">
28-
<span class="navbar-toggler-icon"></span>
29-
</button>
27+
<!-- sidebar toggle -->
28+
<button class="navbar-toggler btn btn-link border-0" type="button" id="sidebar" aria-label="Toggle navigation">
29+
<span class="navbar-toggler-icon"></span>
30+
</button>
31+
</div>
3032
</nav>
3133
</header>
3234

@@ -145,10 +147,10 @@
145147
<li>
146148
<a href="#" class="list-link">
147149
<div class="clearfix">
148-
<div class="float-left"><span class="list-icon"><i class="far fa-bell"></i></span>Messages</div>
149-
<div class="float-right">
150-
<span class="badge badge-danger">New</span>
151-
<span class="badge badge-secondary">4</span>
150+
<div class="float-start"><span class="list-icon"><i class="far fa-bell"></i></span>Messages</div>
151+
<div class="float-end">
152+
<span class="badge bg-danger">New</span>
153+
<span class="badge bg-secondary">4</span>
152154
</div>
153155
</div>
154156
</a>
@@ -191,7 +193,6 @@
191193
<script src="../dist/js/sidebar.menu.js"></script>
192194
<script>
193195
$(function() {
194-
new Sidebar();
195196
new Nanobar().go(100);
196197
new PerfectScrollbar('.scrollbar', {
197198
wheelSpeed: 0.3

‎demo/white.gradient.html

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33

44
<head>
55
<meta charset="UTF-8">
@@ -17,16 +17,18 @@
1717

1818
<header>
1919
<nav class="navbar navbar-expand-md navbar-light bg-light fixed-top">
20+
<div class="container-fluid">
2021

21-
<!-- title -->
22-
<a class="navbar-brand" href="#"><i class="fab fa-bootstrap mr-1 text-danger"></i>
23-
<span class="text-danger">Bootstrap menu</span>
24-
</a>
22+
<!-- title -->
23+
<a class="navbar-brand" href="#"><i class="fab fa-bootstrap mr-1 text-danger"></i>
24+
<span class="text-danger">Bootstrap menu</span>
25+
</a>
2526

26-
<!-- sidebar toggle -->
27-
<button class="navbar-toggler btn btn-link border-0" type="button" id="sidebar" aria-label="Toggle navigation">
28-
<span class="navbar-toggler-icon"></span>
29-
</button>
27+
<!-- sidebar toggle -->
28+
<button class="navbar-toggler btn btn-link border-0" type="button" id="sidebar" aria-label="Toggle navigation">
29+
<span class="navbar-toggler-icon"></span>
30+
</button>
31+
</div>
3032
</nav>
3133
</header>
3234

@@ -145,10 +147,10 @@
145147
<li>
146148
<a href="#" class="list-link">
147149
<div class="clearfix">
148-
<div class="float-left"><span class="list-icon"><i class="far fa-bell"></i></span>Messages</div>
149-
<div class="float-right">
150-
<span class="badge badge-danger">New</span>
151-
<span class="badge badge-secondary">4</span>
150+
<div class="float-start"><span class="list-icon"><i class="far fa-bell"></i></span>Messages</div>
151+
<div class="float-end">
152+
<span class="badge bg-danger">New</span>
153+
<span class="badge bg-secondary">4</span>
152154
</div>
153155
</div>
154156
</a>

‎demo/white.html

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33

44
<head>
55
<meta charset="UTF-8">
@@ -17,16 +17,18 @@
1717

1818
<header>
1919
<nav class="navbar navbar-expand-md navbar-light bg-light fixed-top">
20+
<div class="container-fluid">
2021

21-
<!-- title -->
22-
<a class="navbar-brand" href="#"><i class="fab fa-bootstrap mr-1 text-danger"></i>
23-
<span class="text-danger">Bootstrap menu</span>
24-
</a>
22+
<!-- title -->
23+
<a class="navbar-brand" href="#"><i class="fab fa-bootstrap mr-1 text-danger"></i>
24+
<span class="text-danger">Bootstrap menu</span>
25+
</a>
2526

26-
<!-- sidebar toggle -->
27-
<button class="navbar-toggler btn btn-link border-0" type="button" id="sidebar" aria-label="Toggle navigation">
28-
<span class="navbar-toggler-icon"></span>
29-
</button>
27+
<!-- sidebar toggle -->
28+
<button class="navbar-toggler btn btn-link border-0" type="button" id="sidebar" aria-label="Toggle navigation">
29+
<span class="navbar-toggler-icon"></span>
30+
</button>
31+
</div>
3032
</nav>
3133
</header>
3234

@@ -145,10 +147,10 @@
145147
<li>
146148
<a href="#" class="list-link">
147149
<div class="clearfix">
148-
<div class="float-left"><span class="list-icon"><i class="far fa-bell"></i></span>Messages</div>
149-
<div class="float-right">
150-
<span class="badge badge-danger">New</span>
151-
<span class="badge badge-secondary">4</span>
150+
<div class="float-start"><span class="list-icon"><i class="far fa-bell"></i></span>Messages</div>
151+
<div class="float-end">
152+
<span class="badge bg-danger">New</span>
153+
<span class="badge bg-secondary">4</span>
152154
</div>
153155
</div>
154156
</a>

0 commit comments

Comments
 (0)