Skip to content

Commit c1cf40f

Browse files
davidtmillerdavidtmiller
authored
Merge pull request #23 from BlackrockDigital/v4-dev
Bootstrap 4 Beta Update
2 parents f2612d3 + 1d2a7db commit c1cf40f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+28576
-17828
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

‎404.html‎

Lines changed: 128 additions & 185 deletions
Large diffs are not rendered by default.

‎LICENSE‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
The MIT License (MIT)
32

4-
Copyright (c) 2013-2016 Blackrock Digital LLC.
3+
Copyright (c) 2013-2017 Blackrock Digital LLC
54

65
Permission is hereby granted, free of charge, to any person obtaining a copy
76
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Start Bootstrap is based on the [Bootstrap](http://getbootstrap.com/) framework
2424

2525
## Copyright and License
2626

27-
Copyright 2013-2016 Blackrock Digital LLC. Code released under the [MIT](https://github.com/BlackrockDigital/startbootstrap-modern-business/blob/gh-pages/LICENSE) license.
27+
Copyright 2013-2017 Blackrock Digital LLC. Code released under the [MIT](https://github.com/BlackrockDigital/startbootstrap-modern-business/blob/gh-pages/LICENSE) license.

‎about.html‎

Lines changed: 119 additions & 248 deletions
Large diffs are not rendered by default.

‎blog-home-1.html‎

Lines changed: 150 additions & 228 deletions
Large diffs are not rendered by default.

‎blog-home-2.html‎

Lines changed: 152 additions & 197 deletions
Large diffs are not rendered by default.

‎blog-post.html‎

Lines changed: 155 additions & 219 deletions
Large diffs are not rendered by default.

‎contact.html‎

Lines changed: 90 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -4,179 +4,123 @@
44
<head>
55

66
<meta charset="utf-8">
7-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
98
<meta name="description" content="">
109
<meta name="author" content="">
1110

1211
<title>Modern Business - Start Bootstrap Template</title>
1312

14-
<!-- Bootstrap Core CSS -->
15-
<link href="css/bootstrap.min.css" rel="stylesheet">
13+
<!-- Bootstrap core CSS -->
14+
<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
1615

17-
<!-- Custom CSS -->
16+
<!-- Custom styles for this template -->
1817
<link href="css/modern-business.css" rel="stylesheet">
1918

20-
<!-- Custom Fonts -->
21-
<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
22-
23-
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
24-
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
25-
<!--[if lt IE 9]>
26-
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
27-
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
28-
<![endif]-->
29-
3019
</head>
3120

3221
<body>
3322

3423
<!-- Navigation -->
35-
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
36-
<div class="container">
37-
<!-- Brand and toggle get grouped for better mobile display -->
38-
<div class="navbar-header">
39-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
40-
<span class="sr-only">Toggle navigation</span>
41-
<span class="icon-bar"></span>
42-
<span class="icon-bar"></span>
43-
<span class="icon-bar"></span>
44-
</button>
45-
<a class="navbar-brand" href="index.html">Start Bootstrap</a>
46-
</div>
47-
<!-- Collect the nav links, forms, and other content for toggling -->
48-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
49-
<ul class="nav navbar-nav navbar-right">
50-
<li>
51-
<a href="about.html">About</a>
52-
</li>
53-
<li>
54-
<a href="services.html">Services</a>
55-
</li>
56-
<li class="active">
57-
<a href="contact.html">Contact</a>
58-
</li>
59-
<li class="dropdown">
60-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Portfolio <b class="caret"></b></a>
61-
<ul class="dropdown-menu">
62-
<li>
63-
<a href="portfolio-1-col.html">1 Column Portfolio</a>
64-
</li>
65-
<li>
66-
<a href="portfolio-2-col.html">2 Column Portfolio</a>
67-
</li>
68-
<li>
69-
<a href="portfolio-3-col.html">3 Column Portfolio</a>
70-
</li>
71-
<li>
72-
<a href="portfolio-4-col.html">4 Column Portfolio</a>
73-
</li>
74-
<li>
75-
<a href="portfolio-item.html">Single Portfolio Item</a>
76-
</li>
77-
</ul>
78-
</li>
79-
<li class="dropdown">
80-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Blog <b class="caret"></b></a>
81-
<ul class="dropdown-menu">
82-
<li>
83-
<a href="blog-home-1.html">Blog Home 1</a>
84-
</li>
85-
<li>
86-
<a href="blog-home-2.html">Blog Home 2</a>
87-
</li>
88-
<li>
89-
<a href="blog-post.html">Blog Post</a>
90-
</li>
91-
</ul>
92-
</li>
93-
<li class="dropdown">
94-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Other Pages <b class="caret"></b></a>
95-
<ul class="dropdown-menu">
96-
<li>
97-
<a href="full-width.html">Full Width Page</a>
98-
</li>
99-
<li>
100-
<a href="sidebar.html">Sidebar Page</a>
101-
</li>
102-
<li>
103-
<a href="faq.html">FAQ</a>
104-
</li>
105-
<li>
106-
<a href="404.html">404</a>
107-
</li>
108-
<li>
109-
<a href="pricing.html">Pricing Table</a>
110-
</li>
111-
</ul>
112-
</li>
113-
</ul>
114-
</div>
115-
<!-- /.navbar-collapse -->
24+
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark fixed-top">
25+
<a class="navbar-brand" href="index.html">Start Bootstrap</a>
26+
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
27+
<span class="navbar-toggler-icon"></span>
28+
</button>
29+
<div class="collapse navbar-collapse" id="navbarResponsive">
30+
<ul class="navbar-nav ml-auto">
31+
<li class="nav-item">
32+
<a class="nav-link" href="about.html">About</a>
33+
</li>
34+
<li class="nav-item">
35+
<a class="nav-link" href="services.html">Services</a>
36+
</li>
37+
<li class="nav-item active">
38+
<a class="nav-link" href="contact.html">Contact</a>
39+
</li>
40+
<li class="nav-item dropdown">
41+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownPortfolio" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
42+
Portfolio
43+
</a>
44+
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownPortfolio">
45+
<a class="dropdown-item" href="portfolio-1-col.html">1 Column Portfolio</a>
46+
<a class="dropdown-item" href="portfolio-2-col.html">2 Column Portfolio</a>
47+
<a class="dropdown-item" href="portfolio-3-col.html">3 Column Portfolio</a>
48+
<a class="dropdown-item" href="portfolio-4-col.html">4 Column Portfolio</a>
49+
<a class="dropdown-item" href="portfolio-item.html">Single Portfolio Item</a>
50+
</div>
51+
</li>
52+
<li class="nav-item dropdown">
53+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownBlog" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
54+
Blog
55+
</a>
56+
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownBlog">
57+
<a class="dropdown-item" href="blog-home-1.html">Blog Home 1</a>
58+
<a class="dropdown-item" href="blog-home-2.html">Blog Home 2</a>
59+
<a class="dropdown-item" href="blog-post.html">Blog Post</a>
60+
</div>
61+
</li>
62+
<li class="nav-item dropdown">
63+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownBlog" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
64+
Other Pages
65+
</a>
66+
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownBlog">
67+
<a class="dropdown-item" href="full-width.html">Full Width Page</a>
68+
<a class="dropdown-item" href="sidebar.html">Sidebar Page</a>
69+
<a class="dropdown-item" href="faq.html">FAQ</a>
70+
<a class="dropdown-item" href="404.html">404</a>
71+
<a class="dropdown-item" href="pricing.html">Pricing Table</a>
72+
</div>
73+
</li>
74+
</ul>
11675
</div>
117-
<!-- /.container -->
11876
</nav>
11977

12078
<!-- Page Content -->
12179
<div class="container">
12280

12381
<!-- Page Heading/Breadcrumbs -->
124-
<div class="row">
125-
<div class="col-lg-12">
126-
<h1 class="page-header">Contact
127-
<small>Subheading</small>
128-
</h1>
129-
<ol class="breadcrumb">
130-
<li><a href="index.html">Home</a>
131-
</li>
132-
<li class="active">Contact</li>
133-
</ol>
134-
</div>
135-
</div>
136-
<!-- /.row -->
82+
<h1 class="mt-4 mb-3">Contact <small>Subheading</small></h1>
83+
84+
<ol class="breadcrumb">
85+
<li class="breadcrumb-item">
86+
<a href="index.html">Home</a>
87+
</li>
88+
<li class="breadcrumb-item active">Contact</li>
89+
</ol>
13790

13891
<!-- Content Row -->
13992
<div class="row">
14093
<!-- Map Column -->
141-
<div class="col-md-8">
94+
<div class="col-lg-8 mb-4">
14295
<!-- Embedded Google Map -->
14396
<iframe width="100%" height="400px" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?hl=en&amp;ie=UTF8&amp;ll=37.0625,-95.677068&amp;spn=56.506174,79.013672&amp;t=m&amp;z=4&amp;output=embed"></iframe>
14497
</div>
14598
<!-- Contact Details Column -->
146-
<div class="col-md-4">
99+
<div class="col-lg-4 mb-4">
147100
<h3>Contact Details</h3>
148101
<p>
149-
3481 Melrose Place<br>Beverly Hills, CA 90210<br>
102+
3481 Melrose Place
103+
<br>Beverly Hills, CA 90210
104+
<br>
105+
</p>
106+
<p>
107+
<abbr title="Phone">P</abbr>: (123) 456-7890
150108
</p>
151-
<p><i class="fa fa-phone"></i>
152-
<abbr title="Phone">P</abbr>: (123) 456-7890</p>
153-
<p><i class="fa fa-envelope-o"></i>
154-
<abbr title="Email">E</abbr>: <a href="mailto:name@example.com">name@example.com</a>
109+
<p>
110+
<abbr title="Email">E</abbr>: <a href="mailto:name@example.com">name@example.com
111+
</a>
112+
</p>
113+
<p>
114+
<abbr title="Hours">H</abbr>: Monday - Friday: 9:00 AM to 5:00 PM
155115
</p>
156-
<p><i class="fa fa-clock-o"></i>
157-
<abbr title="Hours">H</abbr>: Monday - Friday: 9:00 AM to 5:00 PM</p>
158-
<ul class="list-unstyled list-inline list-social-icons">
159-
<li>
160-
<a href="#"><i class="fa fa-facebook-square fa-2x"></i></a>
161-
</li>
162-
<li>
163-
<a href="#"><i class="fa fa-linkedin-square fa-2x"></i></a>
164-
</li>
165-
<li>
166-
<a href="#"><i class="fa fa-twitter-square fa-2x"></i></a>
167-
</li>
168-
<li>
169-
<a href="#"><i class="fa fa-google-plus-square fa-2x"></i></a>
170-
</li>
171-
</ul>
172116
</div>
173117
</div>
174118
<!-- /.row -->
175119

176120
<!-- Contact Form -->
177121
<!-- In order to set the email address and subject line for the contact form go to the bin/contact_me.php file. -->
178122
<div class="row">
179-
<div class="col-md-8">
123+
<div class="col-lg-8 mb-4">
180124
<h3>Send us a Message</h3>
181125
<form name="sentMessage" id="contactForm" novalidate>
182126
<div class="control-group form-group">
@@ -213,27 +157,23 @@ <h3>Send us a Message</h3>
213157
</div>
214158
<!-- /.row -->
215159

216-
<hr>
217-
218-
<!-- Footer -->
219-
<footer>
220-
<div class="row">
221-
<div class="col-lg-12">
222-
<p>Copyright &copy; Your Website 2014</p>
223-
</div>
224-
</div>
225-
</footer>
226-
227160
</div>
228161
<!-- /.container -->
229162

230-
<!-- jQuery -->
231-
<script src="js/jquery.js"></script>
163+
<!-- Footer -->
164+
<footer class="py-5 bg-dark">
165+
<div class="container">
166+
<p class="m-0 text-center text-white">Copyright &copy; Your Website 2017</p>
167+
</div>
168+
<!-- /.container -->
169+
</footer>
232170

233-
<!-- Bootstrap Core JavaScript -->
234-
<script src="js/bootstrap.min.js"></script>
171+
<!-- Bootstrap core JavaScript -->
172+
<script src="vendor/jquery/jquery.min.js"></script>
173+
<script src="vendor/popper/popper.min.js"></script>
174+
<script src="vendor/bootstrap/js/bootstrap.min.js"></script>
235175

236-
<!-- Contact Form JavaScript -->
176+
<!-- Contact form JavaScript -->
237177
<!-- Do not edit these files! In order to set the email address and subject line for the contact form go to the bin/contact_me.php file. -->
238178
<script src="js/jqBootstrapValidation.js"></script>
239179
<script src="js/contact_me.js"></script>

0 commit comments

Comments
 (0)