-
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
Final #3
Open
kristyki
wants to merge
72
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
Final #3
Changes from 70 commits
Commits
Show all changes
72 commits
Select commit
Hold shift + click to select a range
5f3d645
Created Index & CSS
60aa8d9
input
5b572b6
Deleted Input
636bdc6
Added Header and Main Navigation
ff66186
Deleted Descriptions of CSS Sections
c04fe07
Added Sections & Footer
ff01398
Added Logo img and Started revisions for CSS
c945561
Index: Added sec03 CSS: LAYOUT/GRID
0f3848d
Added Button text
d8fd40e
Added sec02 Content
dc94300
Added logo and main-nav for CSS
1ffbf05
Deleted Tagline
ab7cc19
link
c880b5c
Main-nav in clearfix and added search bar
3d3a649
Replaced "@" with Search icon
5042b8c
CSS add margin-top
fd5879f
Added placeholder image to sec01
7d1cefd
Miss-typed
607d502
changed text color
3cf33e0
Added Carousel and widths 100%
7f7d18d
Added Carousel and widths 100%
4a3d843
Revert "Added Carousel and widths 100%"
555530e
Div
03bf29b
Call-to-action
053bcfc
Brought back CSS
32a77f0
Added section 02 and another image
2aa7870
Added Footer in CSS
b1277ce
Input more img and constructing Footer
5cdc3b6
Adding font-style to H4
e12820b
Added Baskerville and date picker
5855e4a
Added JS
865bd87
Connected js to html and Adjusted color to date picker
64d17f5
Added Reserve button
cd794df
Added Tme Picker
1f81805
Added Different Time Picker
02e2e90
Added Columns
65ccb1d
Added Social Icons
a8ca635
Took out unnecessary social icons
1a1d579
Added history html
9e73527
Adjustments to history
acbd9cb
Added time
5eb615b
Added img to History
3fcdca6
Adding images with text
0d98b94
Added menu.html
8219750
Put section 2 in rows
2f5ad2d
Added images and rest of content for Hist
704ad95
Refinements
07de72a
Added Menu content
2103e46
Gallery/Index/img
3f6bd0e
Adding buttons for Reservations/Minus the floats
a984518
Added different drop-downs
5634e4d
Changed drop downs again
122c571
Added div class
2e94689
Added class to intro paragraph
0b85222
Took out class Picker and adjusted active face
2fda025
index/history/css/img
97828ae
Added contact page
c47c34b
Added section2
57988da
Adding reserve boxes
69f2e99
Adjusting boxes
5745ae3
Added content
c953160
Added calendar
c5937b7
Added comments pager
14f642e
Adjusting content in Contacts
7d7917d
revisions
4dcdd80
Added Gallery
abc2b22
Revised buttons and added gallery skeleton
745c637
Adding images
6cc729a
Gallery
2bd5753
Adding images to gallery
1df2c96
Arranged code
fed7c7a
Adjusting the sides
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,170 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>KobeSteakhouse</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" /> | ||
|
|
||
| <!-- Latest compiled and minified CSS --> | ||
| <link href='https://fonts.googleapis.com/css?family=Palanquin:400,600' rel='stylesheet' type='text/css'> | ||
|
|
||
|
|
||
| <link href='https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css' rel='stylesheet'> | ||
|
|
||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> | ||
|
|
||
| <link rel="stylesheet" href="css/style.css" type="text/css"> | ||
|
|
||
| </head> | ||
| <body class="contact"> | ||
| <header class="header"> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <h1 class="logo"> | ||
| <a href="index.html">Kobe</a> | ||
| </h1> | ||
| <nav class="main-nav"> | ||
| <div class="clearfix"> | ||
| <div class="input-group input-group-md"> | ||
| <span class="input-group-addon" id="sizing-addon1"> | ||
| <span class="glyphicon glyphicon-search" aria-hidden="true"></span> | ||
| </span> | ||
| <input type="text" class="form-control" placeholder="Search" aria-describedby="sizing-addon1"> | ||
| </div> | ||
| </div> | ||
| <ul> | ||
| <li><a href=index.html>HOME</a></li> | ||
| <li><a href="history.html">HISTORY</a></li> | ||
| <li><a href="menu.html">MENU</a></li> | ||
| <li><a href="gallery.html">GALLERY</a></li> | ||
| <li><a class="active" href="contact.html">CONTACT</a></li> | ||
| </ul> | ||
| </nav> | ||
| </div> | ||
| </div> | ||
| </header> | ||
|
|
||
| <section class="section01"> | ||
| <div class="row text-center"> | ||
| <h2 class="hero-text">Contact</h2> | ||
| </div> | ||
| <img src="images/placeholder-large6.jpg" alt="..." /> | ||
| </section> | ||
|
|
||
| <section class="section02"> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-md-6"> | ||
| <div class="block"> | ||
| <div class="done"> | ||
| <b>Thank you !</b> We have received your message. | ||
| </div> | ||
| <div class="form"> | ||
| <form method="post" action="processinput.php"> | ||
| <div class="element"> | ||
| <label>Name</label> | ||
| <input type="text" name="name" class="text" /> | ||
| </div> | ||
| <div class="element"> | ||
| <label>Email</label> | ||
| <input type="text" name="email" class="text" /> | ||
| </div> | ||
|
|
||
| </div> | ||
| <div class="element"> | ||
| <label>Message</label> | ||
| <textarea name="message" class="text textarea" /></textarea> | ||
| </div> | ||
| <div class="element"> | ||
|
|
||
| <input type="submit" id="submit"/> | ||
| <div class="loading"></div> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-md-6"> | ||
| <div id="datepicker" class="calendar"> | ||
| </div> | ||
|
|
||
| <select class="classic"> | ||
| <option>5:00pm</option> | ||
| <option>5:30pm</option> | ||
| <option>6:00pm</option> | ||
| <option>6:30pm</option> | ||
| <option>7:00pm</option> | ||
| <option>7:30pm</option> | ||
| <option>8:00pm</option> | ||
| <option>8:30pm</option> | ||
| <option>9:00pm</option> | ||
| <option>9:30pm</option> | ||
| </select> | ||
| <br><br> | ||
|
|
||
| <select class="classic"> | ||
| <option>1 Person</option> | ||
| <option>2 People</option> | ||
| <option>3 People</option> | ||
| <option>4 People</option> | ||
| <option>5 People</option> | ||
| <option>6 People</option> | ||
| <option>7 People</option> | ||
| <option>8 People</option> | ||
| <option>9 People</option> | ||
| <option>10 People</option> | ||
| </select> | ||
| <br><br> | ||
|
|
||
| <a class="reserve-button" href="contact.html"> | ||
| <span class="big-text">RESERVE</span> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
|
|
||
|
|
||
| <footer class="footer"> | ||
| <div class="container"> | ||
| <ul class="row"> | ||
| <li>(808) 941-4444</li> | ||
| <li>1814 Ala Moana Blvd. Honolulu, HI</li> | ||
| <li>Daily 5pm–10pm</li> | ||
| </ul> | ||
| <div class="brand-icons"> | ||
| <a class="icon-link facebook brand"><i class="fa fa-facebook"></i></a> | ||
| <a class="icon-link tumblr brand"><i class="fa fa-tumblr"></i></a> | ||
| <a class="icon-link twitter brand"><i class="fa fa-twitter"></i></a> | ||
| <a class="icon-link google-plus brand"><i class="fa fa-google-plus"></i></a> | ||
| </a> | ||
| </div> | ||
| <p class="copyright">© Copyright Kobe Steakhouse Waikiki</p> | ||
| </div> | ||
| </footer> | ||
|
|
||
| <!-- Latest compiled and minified JavaScript --> | ||
| <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js"></script> | ||
|
|
||
| <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script> | ||
|
|
||
| <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> | ||
|
|
||
| <script src="http://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css"></script> | ||
|
|
||
| <script src="js/scripts.js"></script> | ||
| </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.
The reason why the contact form & calendar are not lining up is because they're both in different
.container&.row.Move this
.col-md-6(line 99) up after line 92 or 93.. Please fix indentation, can't tell where your closing tag for.container(line 62),.row(line 63), &.col-md-6(line 64) ends.