Merge branch 'assets' into 'master'

added images to assets directory

Tidying up the file structure.

See merge request !1
This commit is contained in:
Andrew Banchich 2016-08-25 22:03:06 +00:00
commit 10055f5a4a
17 changed files with 22 additions and 22 deletions

View file

Before

Width:  |  Height:  |  Size: 575 KiB

After

Width:  |  Height:  |  Size: 575 KiB

View file

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 61 KiB

View file

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

View file

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 152 KiB

View file

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 93 KiB

View file

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 78 KiB

View file

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 69 KiB

View file

Before

Width:  |  Height:  |  Size: 291 KiB

After

Width:  |  Height:  |  Size: 291 KiB

View file

Before

Width:  |  Height:  |  Size: 291 KiB

After

Width:  |  Height:  |  Size: 291 KiB

View file

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 78 KiB

View file

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

View file

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 117 KiB

View file

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

View file

@ -363,23 +363,23 @@ Finally, this is a <a href="#">link</a>.</p>
<span class="image fit"><img src="images/pic03.jpg" alt="" /></span>
<div class="box alt">
<div class="row 50% uniform">
<div class="4u"><span class="image fit"><img src="images/pic08.jpg" alt="" /></span></div>
<div class="4u"><span class="image fit"><img src="images/pic09.jpg" alt="" /></span></div>
<div class="4u$"><span class="image fit"><img src="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="images/pic10.jpg" alt="" /></span></div>
<div class="4u"><span class="image fit"><img src="images/pic08.jpg" alt="" /></span></div>
<div class="4u$"><span class="image fit"><img src="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="images/pic09.jpg" alt="" /></span></div>
<div class="4u"><span class="image fit"><img src="images/pic10.jpg" alt="" /></span></div>
<div class="4u$"><span class="image fit"><img src="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 &amp; Right</h4>
<p><span class="image left"><img src="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="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>

View file

@ -12,7 +12,7 @@ title: Generic
<header class="major">
<h1>Generic</h1>
</header>
<span class="image main"><img src="images/pic11.jpg" alt="" /></span>
<span class="image main"><img src="assets/images/pic11.jpg" alt="" /></span>
<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien risus, commodo eget turpis at, elementum convallis elit. Pellentesque enim turpis, hendrerit.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis dapibus rutrum facilisis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam tristique libero eu nibh porttitor fermentum. Nullam venenatis erat id vehicula viverra. Nunc ultrices eros ut ultricies condimentum. Mauris risus lacus, blandit sit amet venenatis non, bibendum vitae dolor. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lorem sit amet elit placerat maximus. Pellentesque aliquam maximus risus, vel sed vehicula.</p>
<p>Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fersapien risus, commodo eget turpis at, elementum convallis elit. Pellentesque enim turpis, hendrerit tristique lorem ipsum dolor.</p>

View file

@ -29,7 +29,7 @@ author:
<section id="one" class="tiles">
<article>
<span class="image">
<img src="images/pic01.jpg" alt="" />
<img src="assets/images/pic01.jpg" alt="" />
</span>
<header class="major">
<h3><a href="landing.html" class="link">Aliquam</a></h3>
@ -38,7 +38,7 @@ author:
</article>
<article>
<span class="image">
<img src="images/pic02.jpg" alt="" />
<img src="assets/images/pic02.jpg" alt="" />
</span>
<header class="major">
<h3><a href="landing.html" class="link">Tempus</a></h3>
@ -47,7 +47,7 @@ author:
</article>
<article>
<span class="image">
<img src="images/pic03.jpg" alt="" />
<img src="assets/images/pic03.jpg" alt="" />
</span>
<header class="major">
<h3><a href="landing.html" class="link">Magna</a></h3>
@ -56,7 +56,7 @@ author:
</article>
<article>
<span class="image">
<img src="images/pic04.jpg" alt="" />
<img src="assets/images/pic04.jpg" alt="" />
</span>
<header class="major">
<h3><a href="landing.html" class="link">Ipsum</a></h3>
@ -65,7 +65,7 @@ author:
</article>
<article>
<span class="image">
<img src="images/pic05.jpg" alt="" />
<img src="assets/images/pic05.jpg" alt="" />
</span>
<header class="major">
<h3><a href="landing.html" class="link">Consequat</a></h3>
@ -74,7 +74,7 @@ author:
</article>
<article>
<span class="image">
<img src="images/pic06.jpg" alt="" />
<img src="assets/images/pic06.jpg" alt="" />
</span>
<header class="major">
<h3><a href="landing.html" class="link">Etiam</a></h3>

View file

@ -8,7 +8,7 @@ title: Landing
<section id="banner" class="style2">
<div class="inner">
<span class="image">
<img src="images/pic07.jpg" alt="" />
<img src="assets/images/pic07.jpg" alt="" />
</span>
<header class="major">
<h1>Landing</h1>
@ -37,7 +37,7 @@ title: Landing
<section id="two" class="spotlights">
<section>
<a href="generic.html" class="image">
<img src="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">
@ -53,7 +53,7 @@ title: Landing
</section>
<section>
<a href="generic.html" class="image">
<img src="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">
@ -69,7 +69,7 @@ title: Landing
</section>
<section>
<a href="generic.html" class="image">
<img src="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">