-
Notifications
You must be signed in to change notification settings - Fork 8
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
Midterm #2
Open
kristyki
wants to merge
20
commits into
kcc-nma-art128:master
Choose a base branch
from
kristyki:gh-pages
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Midterm #2
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
417076e
Added index.html and styles.css
ffdbc19
Added Sub Heading * 6
bc506e9
Added footer
adf9db4
Reorganized Footer and Css
595639a
Added fa fa-bookmark
569094b
Added specs to css
0e2e8b8
Adjusted Header Container
8fafb37
Added section02 and pic placeholder image
63a4fc0
Added section02 and created about.html
be819a3
Added headings and content
431cbcc
index/about.html
6ad1fc6
Revised Homepage
bbf26a4
Rearrange Links & Added Footer
b24d5c6
Rearranged Link in index.html
536a09e
Home & About Links
fc5311e
Revised Colums
8f2355b
Revising Main Nav
b3a8bc0
Nav-toggle
dfc5c97
Adjusting active class and footer nav
cbd877f
Removed Column class
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
<!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 href="css/styles.css" rel="stylesheet" type="text/css"> | ||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"> | ||
</head> | ||
<body> | ||
|
||
<header class="header"> | ||
<div class="container"> | ||
<h1 class="logo"><a href="index.html">Company Name</a></h1> | ||
<p class="tagline"><small>A FICTIONAL COMPANY WEBSITE</small></p> | ||
|
||
|
||
|
||
</div> | ||
</header> | ||
|
||
<nav class="main-nav container"> | ||
<ul> | ||
<li><a href="#">Home | ||
<small>Welcome</small></a> | ||
</li> | ||
<li><a class="active" href="index.html">About | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Home should link to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same for |
||
<small>Who We Are</small></a> | ||
</li> | ||
<li><a href="#">Products | ||
<small>What We Sell</small></a> | ||
</li> | ||
<li><a href="#">Contact | ||
<small>How to Get in Touch</small></a> | ||
</li> | ||
</ul> | ||
</nav> | ||
|
||
<main> | ||
<div class="container row"> | ||
<article class="article"> | ||
<h2>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</h2> | ||
<h3>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Curabitur non velit quis turpis dictum tincidunt. </h3> | ||
<h4 class="date">Date of Article MM/DD/YYYY</h4> | ||
<h3>Sed ultrices eget lacus eget maximus. Proin vitae porta sapien</h3> | ||
In hac habitasse platea dictumst. Sed semper ex a dignissim fermentum. Suspendisse potenti. Vivamus a tincidunt ante, sit amet fermentum ligula. Suspendisse id maximus libero, eget suscipit purus. In sem odio, blandit id nisl in, tincidunt pellentesque ipsum. Aenean ipsum orci, venenatis sit amet rhoncus et, pellentesque vitae quam. Quisque in sem et lorem dictum tincidunt nec sit amet orci. Aliquam sit amet euismod magna, vel faucibus lorem. Vivamus sit amet metus sem. Ut eleifend nec dolor lacinia porta. Maecenas porttitor aliquam semper. Duis ut euismod metus. | ||
<p> | ||
Sed ultrices eget lacus eget maximus. Proin vitae porta sapien. In hac habitasse platea dictumst. Sed semper ex a dignissim fermentum. Suspendisse potenti. Vivamus a tincidunt ante, sit amet fermentum ligula. Suspendisse id maximus libero, eget suscipit purus. In sem odio, blandit id nisl in, tincidunt pellentesque ipsum. Aenean ipsum orci, venenatis sit amet rhoncus et, pellentesque vitae quam. Quisque in sem et lorem dictum tincidunt nec sit amet orci. Aliquam sit amet euismod magna, vel faucibus lorem. Vivamus sit amet metus sem. Ut eleifend nec dolor lacinia porta. Maecenas porttitor aliquam semper. Duis ut euismod metus. | ||
</p> | ||
|
||
</article> | ||
</div> | ||
</main> | ||
|
||
|
||
<footer class="footer"> | ||
<nav class="footer-nav"> | ||
<div class="container"> | ||
|
||
<a href="index.html">Company Name</a> | ||
<p class="copyright">© Company Name</p> | ||
|
||
<ul class="row"> | ||
<li class="col"> | ||
<a href="#">Home</a> | ||
<small>Welcome</small> | ||
|
||
</li> | ||
<li class="col"> | ||
<a href="#">About</a> | ||
<small>Who We Are</small> | ||
</li> | ||
|
||
<li class="col"> | ||
<a href="#">Products</a> | ||
<small>What We Sell</small> | ||
</li> | ||
|
||
<li class="col"> | ||
<a href="#">Contact</a> | ||
<small>How to Get in Touch</small> | ||
</li> | ||
</ul> | ||
</div> | ||
</nav> | ||
</footer> | ||
|
||
|
||
|
||
|
||
</body> | ||
</html> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Place
font-awesome.min.css
above yourstyles.css
. It is better to place third party styles above yourstyles.css
. This way your styles wont be overridden from the third party styles.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same for
index.html
.