This repository was archived by the owner on Mar 18, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 14
trying to make this git git work. #4
Open
Ameliawb
wants to merge
17
commits into
bfl-itp:gh-pages
Choose a base branch
from
Ameliawb:gh-pages
base: gh-pages
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
17 commits
Select commit
Hold shift + click to select a range
19a0569
This is my first attempt
Ameliawb 5e1ab12
and another try
Ameliawb ae3277d
Keeping on keeping on
Ameliawb e8ec114
added iFrame vimeo of video
Ameliawb 1abcd4c
added background image
Ameliawb b9331fd
background?
Ameliawb c8ce054
added css
Ameliawb dd5a56e
yup css
Ameliawb 8892b0e
more css
Ameliawb 32a51d0
ugh
Ameliawb fb3f54d
ok i think this is good for a html/css only page for now
Ameliawb ce38876
making Vimeo embedded video responsive...
Ameliawb 79180d6
eh didn't work so well
Ameliawb c26e5d0
again
Ameliawb 2bdeea9
Ok I like it now
Ameliawb 025fc82
Update README.md
Ameliawb f73e415
Update README.md
Ameliawb 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 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 |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| # Instructional Thing, Part II | ||
|
|
||
| Take the [first week's](https://github.com/bfl-itp/syllabus/blob/master/schedule.md#sep-4) offline Instructional Thing assignment online. Modify [`index.html`](index.html), and add any other files you need (CSS, images, etc.) | ||
|
|
||
|
|
||
| *[Amelia's Lego Breadboard](http://www.inventioninbrooklyn.com/learning/Project2/) |
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 @@ | ||
| body { | ||
| background-image: url("http://inventioninbrooklyn.com/learning/Lego.jpg"); | ||
| background-repeat: repeat; | ||
| margin-top: 0px; | ||
| margin-bottom:0px; | ||
| } | ||
|
|
||
| .main { | ||
| margin-left:10%; | ||
| margin-right:10%; | ||
| background:black; | ||
| height:100%; | ||
| width:78%; | ||
| float:center; | ||
| position:absolute; | ||
| } | ||
|
|
||
| .textbox { | ||
| padding-left:2%; | ||
| padding-top:2%; | ||
| position: relative; | ||
| font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; | ||
| color: #FFFFFF; | ||
| font-size: 18px; | ||
| } | ||
|
|
||
| .listbox { | ||
| padding-left:2%; | ||
| padding-top:2%; | ||
| font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; | ||
| color: #FFFFFF; | ||
| font-size: 18px; | ||
| font-size: 14px; | ||
| position: relative; | ||
| } | ||
|
|
||
| .videoWrapper { | ||
| position: relative; | ||
| padding-bottom: 56.25%; /* 16:9 */ | ||
| padding-left:30%; | ||
| padding-top: 25px; | ||
| height: 0; | ||
| } | ||
| .videoWrapper iframe { | ||
| position: absolute; | ||
| top: 0; | ||
| left: 0; | ||
| width: 100%; | ||
| height: 100%; | ||
| } | ||
|
|
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 |
|---|---|---|
| @@ -1,9 +1,33 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>So-and-so's Instructional Assignment</title> | ||
| </head> | ||
| <body> | ||
| YOUR CODE HERE | ||
| </body> | ||
| </html> | ||
|
|
||
| <head> | ||
| <title>Amelia's Breadboard Lego Instructional Assignment</title> | ||
| <link rel="stylesheet" type="text/css" href="amelia.css"> | ||
| </head> | ||
|
|
||
| <body> | ||
| <div class="main"> | ||
|
|
||
| <div class="textbox"> | ||
| Prototyping your circuits with breadboards and legos: | ||
| <div class="listbox"> | ||
|
|
||
| Directions: | ||
| <li> | ||
| pull off adhesive backing of breadboard | ||
| <li> | ||
| press flat lego onto it | ||
| <li>thats it! | ||
| <div class="videoWrapper"> | ||
| <!-- iframe copied from Vimeo and scaled with their 'options' --> | ||
|
|
||
| <iframe src="//player.vimeo.com/video/105842915?title=0&byline=0&portrait=0&color=c9ff23&autoplay=1&loop=1" width="850" height="639" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </body> | ||
|
|
||
| </html> | ||
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.
As reported by the automated tests, just a minor HTML syntax error above.
<li>s should wrap the content for that list item, and all be within aulorol. For example:Make sense?