Skip to content

Commit bfda579

Browse files
devinmattedevinmatte
committed
Moving to Bower
1 parent b725a50 commit bfda579

15 files changed

+592
-2876
lines changed

‎.bowerrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory" : "assets/components"
3+
}

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ Temporary Items
5151

5252
#App Specific Ignored Files
5353
include/configuration.php
54+
assets/components
55+
assets/components/*

‎.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ php:
66

77
services:
88
- mysql
9+
- npm
910

1011
before_install:
1112
- mysql -e 'CREATE DATABASE gitchallenge;'
1213

1314
before_script:
1415
- cp include/configuration-template.php include/configuration.php
16+
- npm install
17+
- npm install -g bower
18+
- bower install
1519

1620
script:
1721
- phpunit test.php

‎assets/css/font-awesome.min.css

-4
This file was deleted.

‎assets/css/main.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url(font-awesome.min.css);
1+
@import url(../components/components-font-awesome/css/font-awesome.min.css);
22
@import "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400";
33

44
/*

‎assets/elements.html

+402-365
Large diffs are not rendered by default.

‎assets/generic.html

+90-72
Original file line numberDiff line numberDiff line change
@@ -5,85 +5,103 @@
55
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
66
-->
77
<html>
8-
<head>
9-
<title>Generic - Stellar by HTML5 UP</title>
10-
<meta charset="utf-8" />
11-
<meta name="viewport" content="width=device-width, initial-scale=1" />
12-
<!--[if lte IE 8]>
13-
<script src="js/ie/html5shiv.js"></script><![endif]-->
14-
<link rel="stylesheet" href="css/main.css" />
15-
<!--[if lte IE 9]>
16-
<link rel="stylesheet" href="css/ie9.css"/><![endif]-->
17-
<!--[if lte IE 8]>
18-
<link rel="stylesheet" href="css/ie8.css"/><![endif]-->
19-
</head>
20-
<body>
8+
<head>
9+
<title>Generic - Stellar by HTML5 UP</title>
10+
<meta charset="utf-8"/>
11+
<meta name="viewport" content="width=device-width, initial-scale=1"/>
12+
<!--[if lte IE 8]>
13+
<script src="js/ie/html5shiv.js"></script><![endif]-->
14+
<link rel="stylesheet" href="css/main.css"/>
15+
<!--[if lte IE 9]>
16+
<link rel="stylesheet" href="css/ie9.css"/><![endif]-->
17+
<!--[if lte IE 8]>
18+
<link rel="stylesheet" href="css/ie8.css"/><![endif]-->
19+
</head>
20+
<body>
2121

22-
<!-- Wrapper -->
23-
<div id="wrapper">
22+
<!-- Wrapper -->
23+
<div id="wrapper">
2424

25-
<!-- Header -->
26-
<header id="header">
27-
<h1>Generic</h1>
28-
<p>Ipsum dolor sit amet nullam</p>
29-
</header>
25+
<!-- Header -->
26+
<header id="header">
27+
<h1>Generic</h1>
28+
<p>Ipsum dolor sit amet nullam</p>
29+
</header>
3030

31-
<!-- Main -->
32-
<div id="main">
31+
<!-- Main -->
32+
<div id="main">
3333

34-
<!-- Content -->
35-
<section id="content" class="main">
36-
<span class="image main"><img src="images/pic04.jpg" alt="" /></span>
37-
<h2>Magna feugiat lorem</h2>
38-
<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 fames ac ante ipsum primis in faucibus.</p>
39-
<p>Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Consequat leo mauris, consectetur id ipsum sit amet, fersapien risus, commodo eget turpis at, elementum convallis elit enim turpis lorem ipsum dolor sit amet feugiat. Phasellus convallis elit id ullamcorper pulvinar. Duis aliquam turpis mauris, eu ultricies erat malesuada quis. Aliquam dapibus, lacus eget hendrerit bibendum, urna est aliquam sem, sit amet est velit quis lorem.</p>
40-
<h2>Tempus veroeros</h2>
41-
<p>Cep risus aliquam gravida cep ut lacus amet. Adipiscing faucibus nunc placerat. Tempus adipiscing turpis non blandit accumsan eget lacinia nunc integer interdum amet aliquam ut orci non col ut ut praesent. Semper amet interdum mi. Phasellus enim laoreet ac ac commodo faucibus faucibus. Curae ante vestibulum ante. Blandit. Ante accumsan nisi eu placerat gravida placerat adipiscing in risus fusce vitae ac mi accumsan nunc in accumsan tempor blandit aliquet aliquet lobortis. Ultricies blandit lobortis praesent turpis. Adipiscing accumsan adipiscing adipiscing ac lacinia cep. Orci blandit a iaculis adipiscing ac. Vivamus ornare laoreet odio vis praesent nunc lorem mi. Erat. Tempus sem faucibus ac id. Vis in blandit. Nascetur ultricies blandit ac. Arcu aliquam. Accumsan mi eget adipiscing nulla. Non vestibulum ac interdum condimentum semper commodo massa arcu.</p>
42-
</section>
34+
<!-- Content -->
35+
<section id="content" class="main">
36+
<span class="image main"><img src="images/pic04.jpg" alt=""/></span>
37+
<h2>Magna feugiat lorem</h2>
38+
<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis
39+
dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet.
40+
Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia
41+
malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien
42+
risus, commodo eget turpis at, elementum convallis fames ac ante ipsum primis in faucibus.</p>
43+
<p>Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas
44+
enim auctor sit amet. Consequat leo mauris, consectetur id ipsum sit amet, fersapien risus, commodo eget
45+
turpis at, elementum convallis elit enim turpis lorem ipsum dolor sit amet feugiat. Phasellus convallis
46+
elit id ullamcorper pulvinar. Duis aliquam turpis mauris, eu ultricies erat malesuada quis. Aliquam
47+
dapibus, lacus eget hendrerit bibendum, urna est aliquam sem, sit amet est velit quis lorem.</p>
48+
<h2>Tempus veroeros</h2>
49+
<p>Cep risus aliquam gravida cep ut lacus amet. Adipiscing faucibus nunc placerat. Tempus adipiscing turpis
50+
non blandit accumsan eget lacinia nunc integer interdum amet aliquam ut orci non col ut ut praesent.
51+
Semper amet interdum mi. Phasellus enim laoreet ac ac commodo faucibus faucibus. Curae ante vestibulum
52+
ante. Blandit. Ante accumsan nisi eu placerat gravida placerat adipiscing in risus fusce vitae ac mi
53+
accumsan nunc in accumsan tempor blandit aliquet aliquet lobortis. Ultricies blandit lobortis praesent
54+
turpis. Adipiscing accumsan adipiscing adipiscing ac lacinia cep. Orci blandit a iaculis adipiscing ac.
55+
Vivamus ornare laoreet odio vis praesent nunc lorem mi. Erat. Tempus sem faucibus ac id. Vis in blandit.
56+
Nascetur ultricies blandit ac. Arcu aliquam. Accumsan mi eget adipiscing nulla. Non vestibulum ac
57+
interdum condimentum semper commodo massa arcu.</p>
58+
</section>
4359

44-
</div>
60+
</div>
4561

46-
<!-- Footer -->
47-
<footer id="footer">
48-
<section>
49-
<h2>Aliquam sed mauris</h2>
50-
<p>Sed lorem ipsum dolor sit amet et nullam consequat feugiat consequat magna adipiscing tempus etiam dolore veroeros. eget dapibus mauris. Cras aliquet, nisl ut viverra sollicitudin, ligula erat egestas velit, vitae tincidunt odio.</p>
51-
<ul class="actions">
52-
<li><a href="#" class="button">Learn More</a></li>
53-
</ul>
54-
</section>
55-
<section>
56-
<h2>Etiam feugiat</h2>
57-
<dl class="alt">
58-
<dt>Address</dt>
59-
<dd>1234 Somewhere Road &bull; Nashville, TN 00000 &bull; USA</dd>
60-
<dt>Phone</dt>
61-
<dd>(000) 000-0000 x 0000</dd>
62-
<dt>Email</dt>
63-
<dd><a href="#">[email protected]</a></dd>
64-
</dl>
65-
<ul class="icons">
66-
<li><a href="#" class="icon fa-twitter alt"><span class="label">Twitter</span></a></li>
67-
<li><a href="#" class="icon fa-facebook alt"><span class="label">Facebook</span></a></li>
68-
<li><a href="#" class="icon fa-instagram alt"><span class="label">Instagram</span></a></li>
69-
<li><a href="#" class="icon fa-github alt"><span class="label">GitHub</span></a></li>
70-
<li><a href="#" class="icon fa-dribbble alt"><span class="label">Dribbble</span></a></li>
71-
</ul>
72-
</section>
73-
<p class="copyright">&copy; Untitled. Design: <a href="https://html5up.net">HTML5 UP</a>.</p>
74-
</footer>
62+
<!-- Footer -->
63+
<footer id="footer">
64+
<section>
65+
<h2>Aliquam sed mauris</h2>
66+
<p>Sed lorem ipsum dolor sit amet et nullam consequat feugiat consequat magna adipiscing tempus etiam dolore
67+
veroeros. eget dapibus mauris. Cras aliquet, nisl ut viverra sollicitudin, ligula erat egestas velit,
68+
vitae tincidunt odio.</p>
69+
<ul class="actions">
70+
<li><a href="#" class="button">Learn More</a></li>
71+
</ul>
72+
</section>
73+
<section>
74+
<h2>Etiam feugiat</h2>
75+
<dl class="alt">
76+
<dt>Address</dt>
77+
<dd>1234 Somewhere Road &bull; Nashville, TN 00000 &bull; USA</dd>
78+
<dt>Phone</dt>
79+
<dd>(000) 000-0000 x 0000</dd>
80+
<dt>Email</dt>
81+
<dd><a href="#">[email protected]</a></dd>
82+
</dl>
83+
<ul class="icons">
84+
<li><a href="#" class="icon fa-twitter alt"><span class="label">Twitter</span></a></li>
85+
<li><a href="#" class="icon fa-facebook alt"><span class="label">Facebook</span></a></li>
86+
<li><a href="#" class="icon fa-instagram alt"><span class="label">Instagram</span></a></li>
87+
<li><a href="#" class="icon fa-github alt"><span class="label">GitHub</span></a></li>
88+
<li><a href="#" class="icon fa-dribbble alt"><span class="label">Dribbble</span></a></li>
89+
</ul>
90+
</section>
91+
<p class="copyright">&copy; Untitled. Design: <a href="https://html5up.net">HTML5 UP</a>.</p>
92+
</footer>
7593

76-
</div>
94+
</div>
7795

78-
<!-- Scripts -->
79-
<script src="js/jquery.min.js"></script>
80-
<script src="js/jquery.scrollex.min.js"></script>
81-
<script src="js/jquery.scrolly.min.js"></script>
82-
<script src="js/skel.min.js"></script>
83-
<script src="js/util.js"></script>
84-
<!--[if lte IE 8]>
85-
<script src="js/ie/respond.min.js"></script><![endif]-->
86-
<script src="js/main.js"></script>
96+
<!-- Scripts -->
97+
<script src="components/jquery/dist/jquery.min.js"></script>
98+
<script src="js/jquery.scrollex.min.js"></script>
99+
<script src="js/jquery.scrolly.min.js"></script>
100+
<script src="components/skel/dist/skel.min.js"></script>
101+
<script src="js/util.js"></script>
102+
<!--[if lte IE 8]>
103+
<script src="js/ie/respond.min.js"></script><![endif]-->
104+
<script src="js/main.js"></script>
87105

88-
</body>
106+
</body>
89107
</html>

0 commit comments

Comments
 (0)