Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gh pages #11

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ Midterm Project for Interface Programming 1 at KCC NMA.
+ PC: Firefox, IE9+, Opera, Chrome
+ MAC: Safari, Firefox, Opera, Chrome
- Turn in your final assignment by creating a pull request.

Binary file added about/images/camera.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added about/images/cameraicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
157 changes: 157 additions & 0 deletions about/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Lissa Hardbarger's Midterm</title>

<!-- HTML5 -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->

<!-- VIEWPORT FOR MOBILE -->
<meta name="viewport" content="width=device-width, initial-scale=1" />

<!-- MAIN CSS -->
<link href="style.css" rel="stylesheet" type="text/css">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see you're using two different stylesheets for your home & about page. It's not necessary to use two, it would be better to use one stylesheet, that way you can reuse styles, & it will be easier to maintain.

This style.css is referencing about/style.css. Having two stylesheets means you have to maintain both home & about page css. For example, your home page navigation looks good while resizing the browser but you would also need to apply those styles to your about/style.css. In the long run, when you start adding more pages, this will be much harder to maintain.


<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
</head>

<body>


<header>
<h1>
Company Name
</h1>
<p class="tagline">
A Fictional Company Website
</p>
</header>


<nav class="mainnav container">

<a href="/index.html">

Home
<br>
<small>
Where We Began
</small>
</a>

<a href="/about/index.html">
About
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Link your home & about page.

<a href="../index.html"> Home </a>
<a href="index.html"> About </a>

<br>
<small>
Who We Are
</small>
</a>

<a href="#">
Products
<br>
<small>
What We Sell
</small>
</a>

<a href="#">
Contact
<br>
<small>
How to Get in Touch
</small>
</a>
</nav>

<section class="section1 container">
<div class="row">
<img src="images/cameraicon.png">
</div>
</section>

<section class="section2 container">
<div class="row">
<h1>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</h1>

<h3>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum ultrices augue vitae purus sodales eleifend.</h3>
<small>Date MM/DD/YYYY</small><br><br>
<h5><strong>Sed faucibus egestas ultricies. Vivamus enim</strong><br>auctor hendrerit elit. Morbi facilisis tempus orci, sed placerat metus auctor non. Etiam non lacus erat, sit amet porttitor tellus. Curabitur pretium tincidunt tortor in vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi quam eros, bibendum ut pellentesque id, tristique eget lacus. Ut fermentum ligula vitae est luctus at iaculis nunc placerat.</h5>
<p class="indent"> Vestibulum urna erat, viverra in dignissim quis, bibendum lobortis sapien. Integer porttitor magna ut orci aliquam sed suscipit eros adipiscing. Pellentesque feugiat mi id eros placerat sit amet hendrerit tortor ultricies. Praesent pellentesque lorem eget ligula egestas sit amet elementum lacus dignissim. Duis semper sapien id massa vehicula quis malesuada est molestie. Vestibulum ac nunc in metus egestas sodales. In dignissim luctus eros, non facilisis nisi vulputate vulputate. Cras bibendum venenatis ipsum, sed euismod quam rhoncus rhoncus. Nullam consectetur augue ac mi convallis nec tempor odio pellentesque
<br>
<br>
<strong>Nam ut metus sit amet odio tincidunt tincidunt vitae a orci.</strong>
<br>
Maecenas at urna sapien, in lobortis tellus. Morbi eget felis eget tellus dapibus pellentesque. Duis dapibus pulvinar ipsum eu dapibus. Suspendisse potenti. Etiam sollicitudin velit eget nisi vulputate eu semper quam semper. Sed vitae ipsum quam. Nunc sed purus nisl, sit amet luctus nisi. Ut enim massa, sagittis et commodo eget,</p>
<p class="quote">
Pellentesque rutrum, nunc sit amet adipiscing tempor, erat leo laoreet est, eu rhoncus risus elit quis lectus. Cras nulla tellus, sollicitudin quis commodo eget, commodo vel sapien.
</p>
<p>Auctor pretium elit. Nunc enim urna, accumsan sed ullamcorper eu, scelerisque gravida sapien. Phasellus tincidunt nunc elementum turpis ornare sit amet congue diam sodales. Sed interdum neque ut ipsum vestibulum euismod. Nulla nec purus ante. Praesent non diam et leo volutpat dictum in id erat. Donec elementum, leo ac blandit ornare, nunc nunc tincidunt mauris, sed ultricies lorem nibh quis lorem.</p>
<p class="indent">Morbi mauris mauris, aliquam eu sollicitudin id, sollicitudin sed nisl. Cras et nunc a leo pulvinar tincidunt. Suspendisse dignissim, sem sit amet consequat varius, eros enim ullamcorper eros, at tincidunt lacus dolor in turpis. Proin tempus ultricies mauris. Sed eu tortor nisi. Pellentesque non nisi justo, vel suscipit orci. Integer dolor metus, scelerisque aliquet sollicitudin sit amet, posuere at mauris. Nunc sem tellus, consequat at pulvinar quis, fringilla vel libero. Integer faucibus fermentum eros. </p>
<br>
<p class="subhead">
Scelerisque scelerisque
</p>
<p><strong>Proin non ipsum ligula, ornare semper purus. </strong><br>
Morbi tincidunt ligula sit amet nulla venenatis sit amet tristique nisl pretium. Nunc facilisis, orci et gravida blandit, lectus augue viverra augue, non tempus ligula leo nec arcu. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam eu elit quis sem posuere sagittis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Mauris congue dolor a magna accumsan eu pharetra mi porta. Cras eget interdum velit.</p>
<p class="indent">
Aenean id nulla in dui iaculis adipiscing. Quisque commodo odio ut lacus auctor pellentesque. Pellentesque egestas pellentesque lorem sed imperdiet. Etiam porta egestas lectus eget interdum. Pellentesque purus neque, elementum non lobortis quis, vulputate ac metus. Etiam et purus a justo accumsan consequat eu elementum ligula. Nullam blandit pretium augue, vitae suscipit mauris lobortis sed. Nam iaculis sem at elit placerat sollicitudin. Ut quis pulvinar leo.
</p><br>
<p><strong>Nam ut metus sit amet odio tincidunt tincidunt vitae a orci.</strong><br>
Maecenas at urna sapien, in lobortis tellus. Morbi eget felis eget tellus dapibus pellentesque. Duis dapibus pulvinar ipsum eu dapibus. Suspendisse potenti. Etiam sollicitudin velit eget nisi vulputate eu semper quam semper. Sed vitae ipsum quam. Nunc sed purus nisl, sit amet luctus nisi. Ut enim massa, sagittis et commodo eget, </p><br>

</div>
</section>


<footer class="footer">
<div class="footernav container">
<a href="#">
<ul>
Home
<li>Welcome</li>
</ul></a>

<a href="#">
<ul>
About
<li>Who We Are</li>
</ul>
</a>

<a href="#">
<ul>
Products
<li>What We Sell</li>
</ul>
</a>

<a href="#">
<ul>
Contact
<li>Get in Touch</li>
</ul>
</a>
</div>
</div>

<div class="container col">
<p class="logo">
Company Name
</p>
<p class="copyright">
&copy; Company Name
</p>
</div>
</footer>
</div>



</div><!-- END CONTAINER -->

</body>
</html>
Loading