-
Notifications
You must be signed in to change notification settings - Fork 18
Marissa & Monica's Web App #12
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
Open
MarissaFelitto
wants to merge
3
commits into
SEA-Design-Dev:master
Choose a base branch
from
MarissaFelitto:master
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
3 commits
Select commit
Hold shift + click to select a range
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
Binary file not shown.
This file contains hidden or 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,89 @@ | ||
| body { | ||
| color: black; | ||
| text-align: center; | ||
| margin: auto; | ||
| font-size: 1em; | ||
| font-family: 'Raleway', sans-serif; | ||
| } | ||
|
|
||
| nav { | ||
| text-align: center; | ||
| background-color: black; | ||
| padding: 2% 0 0 0; | ||
| } | ||
|
|
||
| nav ul { | ||
| padding: 0 0 30px 0; | ||
| list-style: none; | ||
| } | ||
|
|
||
| nav li { | ||
| vertical-align: text-top; | ||
| display: inline-block; | ||
| margin: 0 -3px 0 0; | ||
| } | ||
|
|
||
| nav a { | ||
| padding: 15px 40px; | ||
| color: white; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| nav a:hover { | ||
| color: gray; | ||
| } | ||
|
|
||
| h1 { | ||
| font-size: 2em; | ||
| text-transform: uppercase; | ||
| margin: 2% 0 1% 0; | ||
| } | ||
|
|
||
| h2 { | ||
| font-size: 18px; | ||
| font-weight: normal; | ||
| margin: 1% 0 2% 0; | ||
| } | ||
|
|
||
| form fieldset { | ||
| border: none; | ||
| margin: auto; | ||
| background: #99CCFF; | ||
| border-style: dotted; | ||
| border-width: 3px; | ||
| border-radius: 5px; | ||
| line-height: 30px; | ||
| width: 60%; | ||
| padding-bottom: 1.5%; | ||
| } | ||
|
|
||
| form legend { | ||
| font-size: 24px; | ||
| font-weight: bold; | ||
| padding-bottom: 10px; | ||
| } | ||
|
|
||
| p { | ||
| line-height: 3em; | ||
| } | ||
|
|
||
| label { | ||
| padding: 0 1% 0 1%; | ||
| } | ||
|
|
||
| form button { | ||
| background: black; | ||
| border-color: white; | ||
| border-radius: 20px; | ||
| border-radius: 20px; | ||
| color: white; | ||
| display: block; | ||
| margin: auto; | ||
| padding: 6px 20px; | ||
| text-transform: uppercase; | ||
| } | ||
|
|
||
| form button:hover { | ||
| background: gray; | ||
| cursor: pointer; | ||
| } |
This file contains hidden or 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,48 @@ | ||
| /* http://meyerweb.com/eric/tools/css/reset/ | ||
| v2.0 | 20110126 | ||
| License: none (public domain) | ||
| */ | ||
|
|
||
| html, body, div, span, applet, object, iframe, | ||
| h1, h2, h3, h4, h5, h6, p, blockquote, pre, | ||
| a, abbr, acronym, address, big, cite, code, | ||
| del, dfn, em, img, ins, kbd, q, s, samp, | ||
| small, strike, strong, sub, sup, tt, var, | ||
| b, u, i, center, | ||
| dl, dt, dd, ol, ul, li, | ||
| fieldset, form, label, legend, | ||
| table, caption, tbody, tfoot, thead, tr, th, td, | ||
| article, aside, canvas, details, embed, | ||
| figure, figcaption, footer, header, hgroup, | ||
| menu, nav, output, ruby, section, summary, | ||
| time, mark, audio, video { | ||
| margin: 0; | ||
| padding: 0; | ||
| border: 0; | ||
| font-size: 100%; | ||
| font: inherit; | ||
| vertical-align: baseline; | ||
| } | ||
| /* HTML5 display-role reset for older browsers */ | ||
| article, aside, details, figcaption, figure, | ||
| footer, header, hgroup, menu, nav, section { | ||
| display: block; | ||
| } | ||
| body { | ||
| line-height: 1; | ||
| } | ||
| ol, ul { | ||
| list-style: none; | ||
| } | ||
| blockquote, q { | ||
| quotes: none; | ||
| } | ||
| blockquote:before, blockquote:after, | ||
| q:before, q:after { | ||
| content: ''; | ||
| content: none; | ||
| } | ||
| table { | ||
| border-collapse: collapse; | ||
| border-spacing: 0; | ||
| } |
This file contains hidden or 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,72 @@ | ||
| body { | ||
| width: 100%; | ||
| margin: auto; | ||
| background-color: white; | ||
| font-size: 1em; | ||
| font-family: 'Raleway', sans-serif; | ||
| } | ||
|
|
||
| nav { | ||
| text-align: center; | ||
| background-color: black; | ||
| padding: 2% 0 0 0; | ||
| } | ||
|
|
||
| nav ul { | ||
| padding: 0 0 30px 0; | ||
| list-style: none; | ||
| } | ||
|
|
||
| nav li { | ||
| vertical-align: text-top; | ||
| display: inline-block; | ||
| margin: 0 -3px 0 0; | ||
| } | ||
|
|
||
| nav a { | ||
| padding: 15px 40px; | ||
| color: white; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| nav a:hover { | ||
| color: gray; | ||
| } | ||
|
|
||
| main { | ||
| overflow: hidden; | ||
| background: url("../img/beach.jpg"); | ||
| margin: 3% 0 10% 0; | ||
| } | ||
|
|
||
| h1 { | ||
| text-align: center; | ||
| margin-top: 5%; | ||
| color: #51818; | ||
| font-size: 2em; | ||
| text-transform: uppercase; | ||
| letter-spacing: .05em; | ||
| } | ||
|
|
||
| video { | ||
| float: left; | ||
| margin: 12% 0 0 .5%; | ||
| } | ||
|
|
||
| canvas { | ||
| float: right; | ||
| margin: 3% 3% 3% 0; | ||
| padding: 3% 0 3% 0; | ||
| } | ||
|
|
||
| button { | ||
| float: left; | ||
| margin: 2% 0 0 3.25%; | ||
| width: 376px; | ||
| padding: 10px 0 10px 0; | ||
| background-color: black; | ||
| font-family: 'Raleway', sans-serif; | ||
| color: white; | ||
| font-size: 1.25em; | ||
| letter-spacing: .02em; | ||
| } |
This file contains hidden or 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,67 @@ | ||
| :-webkit-full-screen #myvideo { | ||
| width: 100%; | ||
| height: 100%; | ||
| } | ||
|
|
||
| body { | ||
| margin: auto; | ||
| font-family: 'Raleway', sans-serif; | ||
| font-size: 1em; | ||
| } | ||
|
|
||
| nav { | ||
| text-align: center; | ||
| background-color: black; | ||
| padding: 2% 0 0 0; | ||
| z-index: -100; | ||
| opacity: 0.8; | ||
| } | ||
|
|
||
| nav ul { | ||
| padding: 0 0 30px 0; | ||
| list-style: none; | ||
| } | ||
|
|
||
| nav li { | ||
| vertical-align: text-top; | ||
| display: inline-block; | ||
| margin: 0 -3px 0 0; | ||
| } | ||
|
|
||
| nav a { | ||
| padding: 15px 40px; | ||
| color: white; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| nav a:hover { | ||
| color: gray; | ||
| } | ||
|
|
||
| video { | ||
| position: fixed; | ||
| right: 0; | ||
| bottom: 0; | ||
| min-width: 100%; | ||
| min-height: 100%; | ||
| width: auto; | ||
| height: auto; | ||
| z-index: -99; | ||
| background: url('img/palm.png') no-repeat; | ||
| background-size: cover; | ||
| } | ||
|
|
||
| section { | ||
| background-color: white; | ||
| width: 30%; | ||
| opacity: 0.8; | ||
| margin: 10% 5% 0 20%; | ||
| padding: 2% 5% 2% 2%; | ||
| font-family: 'Raleway', sans-serif; | ||
| } | ||
|
|
||
| h1{ | ||
| font-size: 1.5em; | ||
| text-transform: uppercase; | ||
| margin-bottom: 5%; | ||
| } | ||
This file contains hidden or 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,51 @@ | ||
| <!DOCTYPE HTML> | ||
| <html lang="en-US"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>Contact Us</title> | ||
|
|
||
| <link rel="stylesheet" href="css/reset.css"> | ||
| <link href="css/layout.css" type="text/css" rel="stylesheet" /> | ||
| <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'> | ||
|
|
||
| </head> | ||
| <body> | ||
| <header> | ||
| <nav> | ||
| <ul> | ||
| <li><a href="index.html">Home</a></li> | ||
| <li><a href="video.html">About</a></li> | ||
| <li><a href="form.html">Contact</a></li> | ||
| </ul> | ||
| </nav> | ||
| </header> | ||
|
|
||
| <form id="contact"> | ||
| <h1>Contact Us</h1> | ||
| <h2>Want more information on our resort? Give us your contact info below!</h2> | ||
| <fieldset> | ||
| <legend>User Information</legend> | ||
|
|
||
| <p><label for="first-name">First Name</label> | ||
| <input id="first-name" name="first-name" type="text" placeholder="First Name" required autofocus> | ||
|
|
||
| <label for="last-name">Last Name</label> | ||
| <input id="last-name" name="last-name" type="text" placeholder="Last Name" required autofocus></p> | ||
|
|
||
| <p><label for="email">Email</label> | ||
| <input id="email" name="email" type="email" placeholder="Email" required autofocus></p> | ||
|
|
||
| <p><label for="phone">Phone Number</label> | ||
| <input id="phone" name="phone" type="tel" placeholder="Ex: 123-456-78910" maxlength="12"required pattern="^[0-9]+[\- ]*[0-9]+$" autofocus></p> | ||
|
|
||
| <p><label for="textbox">Where are you from?</label> | ||
| <input id="textbox" name="textbox" type="text" placeholder="City, State, Country" required autofocus></p> | ||
|
|
||
| <button type=submit id="submit" value="submit">Submit</button> | ||
| </fieldset> | ||
| </form> | ||
|
|
||
| <script src='js/localstorageform.js' type='text/javascript'></script> | ||
|
|
||
| </body> | ||
| </html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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,33 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset='utf-8'> | ||
| <title>Access your Camera</title> | ||
|
|
||
| <link rel="stylesheet" href="css/reset.css"> | ||
| <link rel="stylesheet" href="css/style.css"> | ||
| <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'> | ||
|
|
||
| </head> | ||
| <body> | ||
| <header> | ||
| <nav> | ||
| <ul> | ||
| <li><a href="index.html">Home</a></li> | ||
| <li><a href="video.html">About</a></li> | ||
| <li><a href="form.html">Contact</a></li> | ||
| </ul> | ||
| </nav> | ||
| <h1>place yourself in paradise</h1> | ||
| </header> | ||
|
|
||
| <main id="main"> | ||
| <video id="video" width="440" height="280" autoplay></video> | ||
| <canvas id="canvas" width="640" height="480"></canvas> | ||
| <button id="snap">Snap Photo</button> | ||
| </main> | ||
|
|
||
| <script src="js/camera.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.
Some of the properties in this document are double indented. Please fix.