Skip to content

Commit 848f832

Browse files
disjfadisjfa
committed
Updated to bootstrap 4 beta
1 parent 29e2b98 commit 848f832

23 files changed

+190
-84
lines changed

‎.gitignore

100644100755
+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
.gitignore
33
.idea/
44
node_modules/
5-
_site
5+
_site
6+
.sass-cache

‎Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ DEPENDENCIES
5050
minima (~> 2.0)
5151

5252
RUBY VERSION
53-
ruby 2.3.0p0
53+
ruby 2.4.1p111
5454

5555
BUNDLED WITH
56-
1.12.5
56+
1.15.4

‎_layouts/default.html

100644100755
+14-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@
88
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
99
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
1010

11-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
11+
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
1212
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/default.min.css">
13-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
13+
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
1414
<link rel="stylesheet" href="{{ "/css/highlight.css" | prepend: site.baseurl }}">
1515

16+
<link rel="apple-touch-icon" sizes="180x180" href="{{ '/icons/apple-touch-icon.png' | prepend: site.baseurl }}">
17+
<link rel="icon" type="image/png" sizes="32x32" href="{{ '/icons/favicon-32x32.png' | prepend: site.baseurl }}">
18+
<link rel="icon" type="image/png" sizes="16x16" href="{{ '/icons/favicon-16x16.png' | prepend: site.baseurl }}">
19+
<link rel="manifest" href="{{ '/icons/manifest.json' | prepend: site.baseurl }}">
20+
<link rel="mask-icon" href="{{ '/icons/safari-pinned-tab.svg' | prepend: site.baseurl }}" color="#007bff">
21+
<link rel="shortcut icon" href="{{ '/icons/favicon.ico' | prepend: site.baseurl }}">
22+
<meta name="msapplication-config" content="/icons/browserconfig.xml">
23+
<meta name="theme-color" content="#007bff">
24+
1625
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1726
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
1827
{% if page.css %}
@@ -26,8 +35,8 @@
2635
<script src="{{ page.javascript }}"></script>
2736
{% endif %}
2837
<!-- jQuery first, then Tether, then Bootstrap JS. -->
29-
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
30-
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
31-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
38+
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
39+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
40+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
3241
</body>
3342
</html>

‎_posts/2016-10-10-updated-bootstrap.html

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
layout: post
3+
title: "Created easy admin boilerplate!"
4+
date: 2016-12-28 21:36:44 +0100
5+
categories: jekyll update
6+
---
7+
8+
<p>
9+
An awesome template to use for creating an admin template jusing <strong>css flexbox</strong>.
10+
</p>
11+
<p>
12+
Check out <a href="{{ "/easy-admin-boilerplate/"| prepend: site.baseurl }}">easy admin boilerplate</a>.
13+
</p>

‎_posts/2016-12-29-created-easy-admin-boilerplate.html

100644100755
+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
layout: post
3-
title: "Created easy admin boilerplate!"
4-
date: 2016-12-28 21:36:44 +0100
5-
categories: jekyll update
3+
title: "Updated bootstrap!"
4+
date: 2017-10-10 19:36:44 +0100
5+
categories: update
66
---
77

88
<p>
9-
An awesome template to use for creating an admin template jusing <strong>css flexbox</strong>.
9+
Bootstrap released a beta for <a href="https://getbootstrap.com/">bootstrap</a> a while back, so we updated the template.
1010
</p>
1111
<p>
12-
Check out <a href="{{ "/easy-admin-boilerplate/"| prepend: site.baseurl }}">easy admin boilerplate</a>.
12+
Check out <a href="{{ "/"| prepend: site.baseurl }}">all the examples</a>.
1313
</p>

‎card-collapse-tricks/accordion.html

100644100755
+37-34
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,53 @@
11
<div id="accordion" role="tablist" aria-multiselectable="true">
22
<div class="card">
3-
<div class="card-header" role="tab" id="headingOne">
4-
<h5 class="mb-0">
5-
<a data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
6-
<i class="fa fa-chevron-down pull-right"></i>
7-
Collapsible Group Item #1
8-
</a>
9-
</h5>
10-
</div>
3+
<h5 class="card-header" role="tab" id="headingOne">
4+
<a data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne" class="d-block">
5+
<i class="fa fa-chevron-down pull-right"></i> Collapsible Group Item #1
6+
</a>
7+
</h5>
118

12-
<div id="collapseOne" class="collapse in" role="tabpanel" aria-labelledby="headingOne">
13-
<div class="card-block">
14-
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat
15-
craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
9+
<div id="collapseOne" class="collapse show" role="tabpanel" aria-labelledby="headingOne">
10+
<div class="card-body">
11+
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf
12+
moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.
13+
Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda
14+
shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea
15+
proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim
16+
aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
1617
</div>
1718
</div>
1819
</div>
1920
<div class="card">
20-
<div class="card-header" role="tab" id="headingTwo">
21-
<h5 class="mb-0">
22-
<a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
23-
<i class="fa fa-chevron-down pull-right"></i>
24-
Collapsible Group Item #2
25-
</a>
26-
</h5>
27-
</div>
21+
<h5 class="card-header" role="tab" id="headingTwo">
22+
<a class="collapsed d-block" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
23+
<i class="fa fa-chevron-down pull-right"></i> Collapsible Group Item #2
24+
</a>
25+
</h5>
2826
<div id="collapseTwo" class="collapse" role="tabpanel" aria-labelledby="headingTwo">
29-
<div class="card-block">
30-
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat
31-
craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
27+
<div class="card-body">
28+
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf
29+
moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.
30+
Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda
31+
shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea
32+
proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim
33+
aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
3234
</div>
3335
</div>
3436
</div>
3537
<div class="card">
36-
<div class="card-header" role="tab" id="headingThree">
37-
<h5 class="mb-0">
38-
<a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
39-
<i class="fa fa-chevron-down pull-right"></i>
40-
Collapsible Group Item #3
41-
</a>
42-
</h5>
43-
</div>
38+
<h5 class="card-header" role="tab" id="headingThree">
39+
<a class="collapsed d-block" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
40+
<i class="fa fa-chevron-down pull-right"></i> Collapsible Group Item #3
41+
</a>
42+
</h5>
4443
<div id="collapseThree" class="collapse" role="tabpanel" aria-labelledby="headingThree">
45-
<div class="card-block">
46-
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat
47-
craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
44+
<div class="card-body">
45+
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf
46+
moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.
47+
Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda
48+
shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea
49+
proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim
50+
aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
4851
</div>
4952
</div>
5053
</div>

‎card-collapse-tricks/card-collapsed.html

100644100755
+13-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<div class="card">
2-
<div class="card-header" id="heading-collapsed">
3-
<h5 class="mb-0">
4-
<a class="collapsed" data-toggle="collapse" href="#collapse-collapsed" aria-expanded="true" aria-controls="collapse-collapsed">
5-
<i class="fa fa-chevron-down pull-right"></i>
6-
Collapsible Group Item #1
7-
</a>
8-
</h5>
9-
</div>
2+
<h5 class="card-header">
3+
<a class="collapsed d-block" data-toggle="collapse" href="#collapse-collapsed" aria-expanded="true" aria-controls="collapse-collapsed" id="heading-collapsed">
4+
<i class="fa fa-chevron-down pull-right"></i>
5+
Collapsible Group Item #1
6+
</a>
7+
</h5>
108
<div id="collapse-collapsed" class="collapse" aria-labelledby="heading-collapsed">
11-
<div class="card-block">
12-
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
9+
<div class="card-body">
10+
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon
11+
officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3
12+
wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.
13+
Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan
14+
excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt
15+
you probably haven't heard of them accusamus labore sustainable VHS.
1316
</div>
1417
</div>
1518
</div>

‎card-collapse-tricks/card.html

100644100755
+13-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<div class="card">
2-
<div class="card-header" id="heading-example">
3-
<h5 class="mb-0">
4-
<a data-toggle="collapse" href="#collapse-example" aria-expanded="true" aria-controls="collapse-example">
5-
<i class="fa fa-chevron-down pull-right"></i>
6-
Collapsible Group Item #1
7-
</a>
8-
</h5>
9-
</div>
2+
<h5 class="card-header">
3+
<a data-toggle="collapse" href="#collapse-example" aria-expanded="true" aria-controls="collapse-example" id="heading-example" class="d-block">
4+
<i class="fa fa-chevron-down pull-right"></i>
5+
Collapsible Group Item #1
6+
</a>
7+
</h5>
108
<div id="collapse-example" class="collapse show" aria-labelledby="heading-example">
11-
<div class="card-block">
12-
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
9+
<div class="card-body">
10+
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon
11+
officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3
12+
wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.
13+
Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan
14+
excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt
15+
you probably haven't heard of them accusamus labore sustainable VHS.
1316
</div>
1417
</div>
1518
</div>

‎card-collapse-tricks/index.html

100644100755
File mode changed.

0 commit comments

Comments
 (0)