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.

Sign up for GitHub

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

Jump to bottom

Changes step 3 #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Changes step 3 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
007311b
changes
raemasae Mar 8, 2016
5190a7a
change 2
raemasae Mar 15, 2016
8551169
update
raemasae Mar 17, 2016
f426897
section02
raemasae Mar 17, 2016
4cf3164
Merge branch 'kcc-nma-art128/master' into changes-step-3
raemasae Mar 25, 2016
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
Binary file added ._about.html
View file
Open in desktop
Binary file not shown.
158 changes: 158 additions & 0 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Company Name 2</title>

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

<!--MAIN CSS-->
<link rel="stylesheet" href="style.css">
<link rel="stylesheet" href="assets/font-awesome-4.5.0/css/font-awesome.min.css">

</head>
<body>

<header class="header">
<div class="container">
<h1>Company Name</h1>
<p class="tagline">A FICTIONAL COMPANY WEB SITE</p>
</div>
</header>

<nav class="mainnav row">
<div class="container">
<ul>
<li>
<a href="index.html">Home
<p>
Where We began
</p>
</a>
</li>
<li>
<a href="about.html">About
<p>
Who We Are
</p>
</a>
</li>
<li><a href="#">Products
<p>
What We Do
</p>
</a>
</li>
<li><a href="#">Contact
<p>
Need To Get In Touch
</p>
</a>
</li>
</ul>
</div>
</nav>


<section class="aboutsection01">
<div class="container">
<i class="fa fa-camera" style="font-size: 73px;"></i>
</div>
</section>

<main>
<div class="container row">
<article class="article">
<h1>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</h1>
<h2>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum ultrices augue vitae purus sodales eleifend.</h2>
<h4 class="date">Date of Article MM/DD/YYYY</h4>
</article>

<article class="article02">
<p>
<h2>Sed faucibus egestas ultricies. Vivamus enim</h2>
<h3>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.</h3>
</p>

<p>
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.
</p>

<p>
<h4>Nam ut metus sit amet odio tincidunt tincidunt vitae a orci.</h4>
</p>

<p class="p2">
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>

</article>

<article class="article03">
<div class="container">
<p class="boxtext">
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>
</div>

<p class="p2">
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>
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>
</aritcle>

<article class="article04">
<h3>Scelerisque scelerisque</h3>
<h4>
Proin non ipsum ligula, ornare semper purus.
</h4>
<p class="p2">
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>
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>
</article>

<article class="article05">
<h4>Nam ut metus sit amet odio tincidunt tincidunt vitae a orci.</h4>
<p class="p2">
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>

</article>
</div>
</main>

<footer class="footer">
<div class="container row">

<div class="logo">
<a href="logo">Company Name</a>
<p class="copyright">&copy; Copyright CompanyName</p>
</div>

<ul>

<li><a href="index.html">Home</a>
<p>Welcome</p>
</li>
<li><a href="about.html">About</a>
<p>Who We Are</p>
</li>
<li><a href="#">Products</a>
<p>What We Sell</p>
</li>
<li><a href="#">Contact</a>
<p>How To Get In Touch</p>
</li>
</ul>

</div>
</footer>
</body>
Binary file added assets/._font-awesome-4.5.0.textClipping
View file
Open in desktop
Binary file not shown.
Binary file modified assets/CompanyName2.psd
View file
Open in desktop
Binary file not shown.
Empty file added assets/font-awesome-4.5.0.textClipping
View file
Open in desktop
Empty file.
Binary file added assets/font-awesome-4.5.0.zip
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions assets/font-awesome-4.5.0/HELP-US-OUT.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project,
Fonticons (https://fonticons.com). It makes it easy to put the perfect icons on your website. Choose from our awesome,
comprehensive icon sets or copy and paste your own.

Please. Check it out.

-Dave Gandy
Loading