Merge branch 'revert-4e579375' into 'master'
Revert "Merge branch 'assets' into 'master'" This reverts merge request !3 See merge request !4
Andrew Banchich
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
A Jekyll version of the "Forty" theme by [HTML5 UP](https://html5up.net/).
|
||||
|
||||
|
||||
|
||||
|
||||
# How to Use
|
||||
|
||||
|
|
|
|||
|
|
@ -96,10 +96,10 @@
|
|||
</div>
|
||||
|
||||
<!-- Scripts -->
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/_assets/js/jquery.min.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/_assets/js/jquery.scrolly.min.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/_assets/js/jquery.scrollex.min.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/_assets/js/skel.min.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/_assets/js/util.js"></script>
|
||||
<!--[if lte IE 8]><script src="{{ site.url }}{{ site.baseurl }}/_assets/js/ie/respond.min.js"></script><![endif]-->
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/_assets/js/main.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/assets/js/jquery.min.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/assets/js/jquery.scrolly.min.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/assets/js/jquery.scrollex.min.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/assets/js/skel.min.js"></script>
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/assets/js/util.js"></script>
|
||||
<!--[if lte IE 8]><script src="{{ site.url }}{{ site.baseurl }}/assets/js/ie/respond.min.js"></script><![endif]-->
|
||||
<script src="{{ site.url }}{{ site.baseurl }}/assets/js/main.js"></script>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
{% feed_meta %}
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
|
||||
<!--[if lte IE 8]><script src="{{ site.url }}{{ site.baseurl }}/_assets/js/ie/html5shiv.js"></script><![endif]-->
|
||||
<link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/_assets/css/main.css" />
|
||||
<!--[if lte IE 9]><link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/_assets/css/ie9.css" /><![endif]-->
|
||||
<!--[if lte IE 8]><link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/_assets/css/ie8.css" /><![endif]-->
|
||||
<!--[if lte IE 8]><script src="{{ site.url }}{{ site.baseurl }}/assets/js/ie/html5shiv.js"></script><![endif]-->
|
||||
<link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/assets/css/main.css" />
|
||||
<!--[if lte IE 9]><link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/assets/css/ie9.css" /><![endif]-->
|
||||
<!--[if lte IE 8]><link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/assets/css/ie8.css" /><![endif]-->
|
||||
</head>
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
layout: post
|
||||
title: Etiam
|
||||
description: Feugiat amet tempus
|
||||
image: _assets/images/pic06.jpg
|
||||
image: assets/images/pic06.jpg
|
||||
---
|
||||
|
||||
Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
layout: post
|
||||
title: Consequat
|
||||
description: Ipsum dolor sit amet
|
||||
image: _assets/images/pic05.jpg
|
||||
image: assets/images/pic05.jpg
|
||||
---
|
||||
|
||||
Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
layout: post
|
||||
title: Ipsum
|
||||
description: Nisl sed aliquam
|
||||
image: _assets/images/pic04.jpg
|
||||
image: assets/images/pic04.jpg
|
||||
---
|
||||
|
||||
Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
layout: post
|
||||
title: Magna
|
||||
description: Lorem etiam nullam
|
||||
image: _assets/images/pic03.jpg
|
||||
image: assets/images/pic03.jpg
|
||||
---
|
||||
|
||||
Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
layout: post
|
||||
title: Tempus
|
||||
description: Feugiat amet tempus
|
||||
image: _assets/images/pic02.jpg
|
||||
image: assets/images/pic02.jpg
|
||||
---
|
||||
|
||||
Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
layout: post
|
||||
title: Aliquam
|
||||
description: Ipsum dolor sit amet
|
||||
image: _assets/images/pic01.jpg
|
||||
image: assets/images/pic01.jpg
|
||||
---
|
||||
|
||||
Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis.
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
.tiles article {
|
||||
width: 50%;
|
||||
-ms-behavior: url("_assets/js/ie/backgroundsize.min.htc");
|
||||
-ms-behavior: url("assets/js/ie/backgroundsize.min.htc");
|
||||
background-size: cover;
|
||||
}
|
||||
|
||||
/* Banner */
|
||||
|
||||
#banner {
|
||||
-ms-behavior: url("_assets/js/ie/backgroundsize.min.htc");
|
||||
-ms-behavior: url("assets/js/ie/backgroundsize.min.htc");
|
||||
}
|
||||
|
||||
#banner:after {
|
||||
|
Before Width: | Height: | Size: 382 KiB After Width: | Height: | Size: 382 KiB |
|
Before Width: | Height: | Size: 575 KiB After Width: | Height: | Size: 575 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 152 KiB After Width: | Height: | Size: 152 KiB |
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 93 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 146 KiB |
|
Before Width: | Height: | Size: 291 KiB After Width: | Height: | Size: 291 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 86 KiB |
|
|
@ -28,7 +28,7 @@
|
|||
.tiles {
|
||||
article {
|
||||
width: 50%;
|
||||
-ms-behavior: url('_assets/js/ie/backgroundsize.min.htc');
|
||||
-ms-behavior: url('assets/js/ie/backgroundsize.min.htc');
|
||||
background-size: cover;
|
||||
}
|
||||
}
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
/* Banner */
|
||||
|
||||
#banner {
|
||||
-ms-behavior: url('_assets/js/ie/backgroundsize.min.htc');
|
||||
-ms-behavior: url('assets/js/ie/backgroundsize.min.htc');
|
||||
|
||||
&:after {
|
||||
display: none;
|
||||
24
elements.md
|
|
@ -360,26 +360,26 @@ Finally, this is a <a href="#">link</a>.</p>
|
|||
<h3>Image</h3>
|
||||
|
||||
<h4>Fit</h4>
|
||||
<span class="image fit"><img src="_assets/images/pic03.jpg" alt="" /></span>
|
||||
<span class="image fit"><img src="assets/images/pic03.jpg" alt="" /></span>
|
||||
<div class="box alt">
|
||||
<div class="row 50% uniform">
|
||||
<div class="4u"><span class="image fit"><img src="_assets/images/pic08.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="_assets/images/pic09.jpg" alt="" /></span></div>
|
||||
<div class="4u$"><span class="image fit"><img src="_assets/images/pic10.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="assets/images/pic08.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="assets/images/pic09.jpg" alt="" /></span></div>
|
||||
<div class="4u$"><span class="image fit"><img src="assets/images/pic10.jpg" alt="" /></span></div>
|
||||
<!-- Break -->
|
||||
<div class="4u"><span class="image fit"><img src="_assets/images/pic10.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="_assets/images/pic08.jpg" alt="" /></span></div>
|
||||
<div class="4u$"><span class="image fit"><img src="_assets/images/pic09.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="assets/images/pic10.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="assets/images/pic08.jpg" alt="" /></span></div>
|
||||
<div class="4u$"><span class="image fit"><img src="assets/images/pic09.jpg" alt="" /></span></div>
|
||||
<!-- Break -->
|
||||
<div class="4u"><span class="image fit"><img src="_assets/images/pic09.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="_assets/images/pic10.jpg" alt="" /></span></div>
|
||||
<div class="4u$"><span class="image fit"><img src="_assets/images/pic08.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="assets/images/pic09.jpg" alt="" /></span></div>
|
||||
<div class="4u"><span class="image fit"><img src="assets/images/pic10.jpg" alt="" /></span></div>
|
||||
<div class="4u$"><span class="image fit"><img src="assets/images/pic08.jpg" alt="" /></span></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h4>Left & Right</h4>
|
||||
<p><span class="image left"><img src="_assets/images/pic09.jpg" alt="" /></span>Lorem ipsum dolor sit accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget tempus vestibulum ante ipsum primis in faucibus magna blandit adipiscing eu felis iaculis.</p>
|
||||
<p><span class="image right"><img src="_assets/images/pic10.jpg" alt="" /></span>Lorem ipsum dolor sit accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget tempus vestibulum ante ipsum primis in faucibus magna blandit adipiscing eu felis iaculis.</p>
|
||||
<p><span class="image left"><img src="assets/images/pic09.jpg" alt="" /></span>Lorem ipsum dolor sit accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget tempus vestibulum ante ipsum primis in faucibus magna blandit adipiscing eu felis iaculis.</p>
|
||||
<p><span class="image right"><img src="assets/images/pic10.jpg" alt="" /></span>Lorem ipsum dolor sit accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget tempus vestibulum ante ipsum primis in faucibus magna blandit adipiscing eu felis iaculis.</p>
|
||||
|
||||
<!-- Box -->
|
||||
<h3>Box</h3>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
layout: post
|
||||
title: Generic
|
||||
description: Lorem ipsum dolor est
|
||||
image: _assets/images/pic11.jpg
|
||||
image: assets/images/pic11.jpg
|
||||
nav-menu: yes
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
layout: landing
|
||||
title: Landing
|
||||
description: Lorem ipsum dolor sit amet nullam consequat<br />sed veroeros. tempus adipiscing nulla.
|
||||
image: _assets/images/pic07.jpg
|
||||
image: assets/images/pic07.jpg
|
||||
nav-menu: yes
|
||||
---
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ nav-menu: yes
|
|||
<section id="two" class="spotlights">
|
||||
<section>
|
||||
<a href="generic.html" class="image">
|
||||
<img src="_assets/images/pic08.jpg" alt="" data-position="center center" />
|
||||
<img src="assets/images/pic08.jpg" alt="" data-position="center center" />
|
||||
</a>
|
||||
<div class="content">
|
||||
<div class="inner">
|
||||
|
|
@ -55,7 +55,7 @@ nav-menu: yes
|
|||
</section>
|
||||
<section>
|
||||
<a href="generic.html" class="image">
|
||||
<img src="_assets/images/pic09.jpg" alt="" data-position="top center" />
|
||||
<img src="assets/images/pic09.jpg" alt="" data-position="top center" />
|
||||
</a>
|
||||
<div class="content">
|
||||
<div class="inner">
|
||||
|
|
@ -71,7 +71,7 @@ nav-menu: yes
|
|||
</section>
|
||||
<section>
|
||||
<a href="generic.html" class="image">
|
||||
<img src="_assets/images/pic10.jpg" alt="" data-position="25% 25%" />
|
||||
<img src="assets/images/pic10.jpg" alt="" data-position="25% 25%" />
|
||||
</a>
|
||||
<div class="content">
|
||||
<div class="inner">
|
||||
|
|
|
|||