-
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
Company Name2 #5
Open
MikaKatagiri
wants to merge
16
commits into
kcc-nma-art128:master
Choose a base branch
from
MikaKatagiri: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
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
15fa4a6
add change on HTML
11c89d1
made change on css
6130d09
added icons
07fef10
fixed section3
7ba25f1
add change at home
92da887
adjusted to the center
2b70163
added omg
6147c57
added links
1d2e2e3
made about page
ce7afa9
added about.html
50d6252
add change to about/style.css
70dcd08
add change
b8e78fb
add change to nav
96be4d8
add change to about page
590611c
add change
353721f
bug fixed
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,154 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <title>CompanyName2</title> | ||
|
|
||
| <!-- VIEWPORT FOR MOBILE --> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <link href="css/font-awesome.css" rel="stylesheet" type="text/css"> | ||
|
|
||
| <!-- MAIN CSS --> | ||
| <link href="about/style.css" rel="stylesheet" type="text/css"> | ||
| </head> | ||
| <body> | ||
|
|
||
| <header class="header"> | ||
| <h1>Company Name</h1> | ||
| <p class="tagline">AFICTIONAL COMPANY WEB SITE</p> | ||
| </header> | ||
|
|
||
| <nav class="mainnav container"> | ||
| <ul> | ||
| <li><a href="#">About</a><p><small>Who We Are</small></p></li> | ||
| <li><a href="#">Products</a><p><small>What We Sell</small></p></li> | ||
| <li><a href="#">Contact</a><p><small>How To Get in Touch</small></p></li> | ||
| </ul> | ||
| </nav> | ||
|
|
||
| <section class="section1 container"> | ||
| <img src="camera2.jpg" alt="camera" /> | ||
| <h3>Lorem ispum Dolor sit amet, consecteur adipiscing elit.</h3> | ||
| <p>Vivamus eu mollis velit. Maecenas id massa libero. Aliquam accumsan | ||
| mauris vulputate purus volutpat vestibulum. Phasellus sed tellus id | ||
| tortor ornare molestie. Quisque massa sapien, elementum | ||
| </p> | ||
|
|
||
| <p>Date MM/DD/YYYY</p> | ||
| </section> | ||
|
|
||
| <section class="section2 container"> | ||
| <h4>Sed faucibus egestas ultricies. Vivamus enim</h4> | ||
| <p> | ||
| auctor hendrerit elit. Morbi facilisis tempus orci, sed placerat me | ||
| tus auctor non. Etiam non lacus erat, | ||
| sit amet porttitor tellus. Curabitur pretium tincidunt torto | ||
| r in vulputate. Vestibulum ante ipsum primis in faucibus orci luctus | ||
| et ultrices posuere cubilia Curae; Morbi quam eros, biben | ||
| dum ut pellentesque id, tristique eget lacus. Ut fermentum ligula | ||
| vitae est luctus at iaculis nunc placerat. | ||
| </p> | ||
| <small>Vestibulum urna erat, viverra in dignissim quis, bibendum lobort | ||
| is sapien. Integer porttitor magna ut orci aliquam sed suscipit eros | ||
| adipiscing. Pellentesque feugiat mi id eros placerat sit amet hendreri | ||
| t tortor ultricies. Praesent pellentesque lorem eget ligula egestas sit | ||
| amet elementum lacus dignissim. Duis semper sapien id massa vehicula q | ||
| uis malesuada est molestie. Vestibulum ac nunc in metus egestas sodales. | ||
| In dignissim luctus eros, non facilisis nisi vulputate vulputate. Cras b | ||
| ibendum venenatis ipsum, sed euismod quam rhoncus rhoncus. Nullam consec | ||
| tetur augue ac mi convallis nec tempor odio pellentesque.</small> | ||
|
|
||
| <h6>Nam ut metus sit amet odio tincidunt tincidunt vitae a orci.</h6> | ||
| <small>Maecenas at urna sapien, in lobortis tellus. Morbi eget felis eg | ||
| et tellus dapibus pellentesque. Duis dapibus pulvinar ipsum eu dapibu | ||
| s. Suspendisse potenti. Etiam sollicitudin velit eget nisi vulputate eu sem | ||
| per quam semper. Sed vitae ipsum quam. Nunc sed purus nisl, sit amet luctus | ||
| nisi. Ut enim massa, sagittis et commodo eget, </small> | ||
|
|
||
| <div class="container"> | ||
| Pellentesque rutrum, nunc sit amet adipiscing tempor, erat leo laoreet est, | ||
| eu rhoncus risus elit quis lectus. Cras nulla tellus, sollicitudin quis co | ||
| mmodo eget, commodo vel sapien. | ||
| </div> | ||
|
|
||
| <p> | ||
| Auctor pretium elit. Nunc enim urna, accumsan sed ullamcorper eu, sceleris | ||
| que gravida sapien. Phasellus tincidunt nunc elementum turpis ornare sit am | ||
| et congue diam sodales. Sed interdum neque ut ipsum vestibulum euismod. Nul | ||
| la nec purus ante. Praesent non diam et leo volutpat dictum in id erat. Don | ||
| ec elementum, leo ac blandit ornare, nunc nunc tincidunt mauris, sed ultric | ||
| ies lorem nibh quis lorem. | ||
| </p> | ||
|
|
||
| <p> | ||
| Morbi mauris mauris, aliquam eu sollicitudin id, sollicitudin sed nisl. Cra | ||
| s et nunc a leo pulvinar tincidunt. Suspendisse dignissim, sem sit amet con | ||
| sequat varius, eros enim ullamcorper eros, at tincidunt lacus dolor in turp | ||
| is. Proin tempus ultricies mauris. Sed eu tortor nisi. Pellentesque non nis | ||
| i justo, vel suscipit orci. Integer dolor metus, scelerisque aliquet sollic | ||
| itudin sit amet, posuere at mauris. Nunc sem tellus, consequat at pulvinar | ||
| quis, fringilla vel libero. Integer faucibus fermentum eros. | ||
| </p> | ||
|
|
||
| <h4>Scelerisque scelerisque</h4> | ||
| <h6>Proin non ipsum ligula, ornare semper purus. </h6> | ||
| <p> | ||
| Morbi tincidunt ligula sit amet nulla venenatis sit amet tristique nisl pre | ||
| tium. Nunc facilisis, orci et gravida blandit, lectus augue viverra augue, n | ||
| on tempus ligula leo nec arcu. Cum sociis natoque penatibus et magnis dis p | ||
| arturient montes, nascetur ridiculus mus. Nullam eu elit quis sem posuere | ||
| sagittis. Class aptent taciti sociosqu ad litora torquent per conubia nostr | ||
| a, 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 au | ||
| ctor pellentesque. Pellentesque egestas pellentesque lorem sed imperdiet. E | ||
| tiam porta egestas lectus eget interdum. Pellentesque purus neque, elementu | ||
| m non lobortis quis, vulputate ac metus. Etiam et purus a justo accumsan co | ||
| nsequat eu elementum ligula. Nullam blandit pretium augue, vitae suscipit m | ||
| auris lobortis sed. Nam iaculis sem at elit placerat sollicitudin. Ut quis | ||
| pulvinar leo. | ||
| </p> | ||
|
|
||
| <h6> | ||
| Nam ut metus sit amet odio tincidunt tincidunt vitae a orci.</h6> | ||
| <p> | ||
| Maecenas at urna sapien, in lobortis tellus. Morbi eget felis eget tellu | ||
| s dapibus pellentesque. Duis dapibus pulvinar ipsum eu dapibus. Suspendi | ||
| sse 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> | ||
| </section> | ||
|
|
||
|
|
||
|
|
||
| <footer class="footer"> | ||
| <div class="row"> | ||
|
|
||
| <div class="logo"> | ||
| <h3><a href="#">Company Name</a></h3> | ||
| <p class="copyright">© Copyright CompanyName</p> | ||
| </div> | ||
|
|
||
| <ul> | ||
| <li class="col"> | ||
| <h6><a href="#">Home</a></h6><p>Welcome</p> | ||
| </li> | ||
| <li class="col"> | ||
| <h6><a href="#">About</a></h6><p>Who We Are</p> | ||
| </li> | ||
| <li class="col"> | ||
| <h6><a href="#">Products</a></h6><p>What We Sell</p> | ||
| </li> | ||
| <li class="col"> | ||
| <h6><a href="#">Contact</a></h6><p>How to Get in Touch</p> | ||
| </li> | ||
| </ul> | ||
|
|
||
| </div> | ||
| </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.
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.