From 19a05694f3ad85dae4b34fb61e0d8ca0eddb1748 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Thu, 11 Sep 2014 12:05:58 -0400 Subject: [PATCH 01/17] This is my first attempt --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 6257184..f449218 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,6 @@ So-and-so's Instructional Assignment - YOUR CODE HERE + This is my first try to try this out... From 5e1ab12595067ffe2da7745ee3ca136017e55126 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Thu, 11 Sep 2014 12:07:34 -0400 Subject: [PATCH 02/17] and another try --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index f449218..2d05bc3 100644 --- a/index.html +++ b/index.html @@ -5,5 +5,8 @@ This is my first try to try this out... +
  • + and this +
    • From ae3277d910f7064e401fe2d41ac46105271e1636 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Thu, 11 Sep 2014 18:58:13 -0400 Subject: [PATCH 03/17] Keeping on keeping on --- index.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 2d05bc3..430c2c8 100644 --- a/index.html +++ b/index.html @@ -4,9 +4,12 @@ So-and-so's Instructional Assignment - This is my first try to try this out... + Amelia goes git
  • - and this + git
    • +

    + git git git +

    From e8ec1140891281caf4f000fa58ae078712767d51 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Thu, 11 Sep 2014 20:41:36 -0400 Subject: [PATCH 04/17] added iFrame vimeo of video --- index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.html b/index.html index 430c2c8..8469f74 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,8 @@ Amelia goes git +

    +

  • git
    • From 1abcd4cda7a8ef58749d5c40954a9f5c5f4db9a1 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Sun, 14 Sep 2014 15:07:16 -0400 Subject: [PATCH 05/17] added background image --- index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/index.html b/index.html index 8469f74..d11a332 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,10 @@ So-and-so's Instructional Assignment + div { + background-image:url('learning/lego.jpg'); + background-repeat:repeat; +} Amelia goes git

    From b9331fd4de5a6c90e27b19dfd3299d7d2b86c77c Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Sun, 14 Sep 2014 15:12:04 -0400 Subject: [PATCH 06/17] background? --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index d11a332..a9786c3 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,9 @@ So-and-so's Instructional Assignment +

    +

    The background image doesn't repeat.

    +
    div { background-image:url('learning/lego.jpg'); background-repeat:repeat; From c8ce0547dc67e073c7c434005043889b45f90b9c Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Sun, 14 Sep 2014 15:25:05 -0400 Subject: [PATCH 07/17] added css --- amelia.css | 5 +++++ index.html | 37 +++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 amelia.css diff --git a/amelia.css b/amelia.css new file mode 100644 index 0000000..69c39b6 --- /dev/null +++ b/amelia.css @@ -0,0 +1,5 @@ +body { + background-image: url("http://inventioninbrooklyn.com/learning/Lego.jpg"); + background-position: 50% 50%; + background-repeat: repeat; +} \ No newline at end of file diff --git a/index.html b/index.html index a9786c3..f296ac5 100644 --- a/index.html +++ b/index.html @@ -1,24 +1,25 @@ - + + So-and-so's Instructional Assignment - - -
    -

    The background image doesn't repeat.

    -
    - div { - background-image:url('learning/lego.jpg'); - background-repeat:repeat; + + + + body { + background: url("http://inventioninbrooklyn.com/learning/Lego.jpg"); } + + Amelia goes git

    - -

  • - git -
    • -

    - git git git -

    - - + +
  • + git +
    • +

    + git git git +

    + + + \ No newline at end of file From dd5a56ed0993095f4750572e59c38fad4611ba99 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Sun, 14 Sep 2014 15:26:29 -0400 Subject: [PATCH 08/17] yup css --- index.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index f296ac5..7fa59eb 100644 --- a/index.html +++ b/index.html @@ -2,14 +2,11 @@ - So-and-so's Instructional Assignment + Amelia's Breadboard Lego Instructional Assignment + - body { - background: url("http://inventioninbrooklyn.com/learning/Lego.jpg"); -} - Amelia goes git

    From 8892b0e8cb40c9d21a6ab8a02cc4bb13fa68846e Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Sun, 14 Sep 2014 15:58:39 -0400 Subject: [PATCH 09/17] more css --- amelia.css | 33 ++++++++++++++++++++++++++++++--- index.html | 15 +++++++-------- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/amelia.css b/amelia.css index 69c39b6..54f9745 100644 --- a/amelia.css +++ b/amelia.css @@ -1,5 +1,32 @@ body { - background-image: url("http://inventioninbrooklyn.com/learning/Lego.jpg"); - background-position: 50% 50%; - background-repeat: repeat; + background-image: url("http://inventioninbrooklyn.com/learning/Lego.jpg"); + background-position: 50% 50%; + background-repeat: repeat; +} + +.main { + width: 500px; + border: 1px solid black; + overflow: hidden; /* will contain if #first is longer than #second */ +} +.textbox { + background:green; + width: 700px; + float:left; /* add this */ + /*border: 1px solid red;*/ +} +.vimeo { + border: 1px solid green; + overflow: hidden; /* if you don't want #second to wrap below #first */ +} + +@media only screen and (min-width: 481px) { + + div.vimeo { + width: 50%; +margin-left: 10%; +margin-right: 5%; + clear: none; + float: left; +} } \ No newline at end of file diff --git a/index.html b/index.html index 7fa59eb..a57ee17 100644 --- a/index.html +++ b/index.html @@ -7,16 +7,15 @@ +

    - Amelia goes git -

    +

    + yes yes it is +
    +
    -
  • - git -
    • -

    - git git git -

    +
    +
    \ No newline at end of file From 32a51d094a8f32cc67d82b462a1f68c33a857ea4 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Sun, 14 Sep 2014 16:06:44 -0400 Subject: [PATCH 10/17] ugh --- amelia.css | 13 +++++-------- index.html | 4 +++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/amelia.css b/amelia.css index 54f9745..dbc4aa9 100644 --- a/amelia.css +++ b/amelia.css @@ -5,19 +5,16 @@ body { } .main { - width: 500px; - border: 1px solid black; + width: auto; + padding-left:10%; overflow: hidden; /* will contain if #first is longer than #second */ } .textbox { - background:green; - width: 700px; - float:left; /* add this */ - /*border: 1px solid red;*/ + background:yellow; + float:left; + } .vimeo { - border: 1px solid green; - overflow: hidden; /* if you don't want #second to wrap below #first */ } @media only screen and (min-width: 481px) { diff --git a/index.html b/index.html index a57ee17..4b33064 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,9 @@
    - yes yes it is + Prototyping your circuits with breadboards is easy +

    + It is even easier to use legos watch this video to find out more

    From fb3f54db4e5cf937718b54918e617529d5216a93 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Sun, 14 Sep 2014 16:28:29 -0400 Subject: [PATCH 11/17] ok i think this is good for a html/css only page for now --- amelia.css | 23 ++++++++--------------- index.html | 25 ++++++++++++++++--------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/amelia.css b/amelia.css index dbc4aa9..a9d4844 100644 --- a/amelia.css +++ b/amelia.css @@ -6,24 +6,17 @@ body { .main { width: auto; - padding-left:10%; - overflow: hidden; /* will contain if #first is longer than #second */ + padding-left:20%; + padding-right:20%; } .textbox { + font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; + font-size: 18px; + width:610px; + height:600px; background:yellow; - float:left; - -} -.vimeo { + padding-left:.5%; + overflow:scroll; } -@media only screen and (min-width: 481px) { - div.vimeo { - width: 50%; -margin-left: 10%; -margin-right: 5%; - clear: none; - float: left; -} -} \ No newline at end of file diff --git a/index.html b/index.html index 4b33064..e6e2584 100644 --- a/index.html +++ b/index.html @@ -9,15 +9,22 @@
    -
    - Prototyping your circuits with breadboards is easy -

    - It is even easier to use legos watch this video to find out more -

    -
    - -
    -
    +
    + Prototyping your circuits with breadboards is easy +
    It is even easier to use legos watch this video to find out more: + + + + + Directions: +

    +

  • + pull off adhesive backing of breadboard +
  • + press flat lego onto it +
  • thats it! +
    • +
    \ No newline at end of file From ce38876695e3f8649bed62061b4733e5b9b9adc2 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Thu, 18 Sep 2014 00:05:08 -0400 Subject: [PATCH 12/17] making Vimeo embedded video responsive... --- amelia.css | 13 +++++++++++++ index.html | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/amelia.css b/amelia.css index a9d4844..29faba4 100644 --- a/amelia.css +++ b/amelia.css @@ -20,3 +20,16 @@ body { } +.videoWrapper { + position: relative; + padding-bottom: 56.25%; /* 16:9 */ + padding-top: 25px; + height: 0; +} +.videoWrapper iframe { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/index.html b/index.html index e6e2584..2d3690e 100644 --- a/index.html +++ b/index.html @@ -13,9 +13,11 @@ Prototyping your circuits with breadboards is easy
    It is even easier to use legos watch this video to find out more: +
    + - +
    Directions:

  • From 79180d6d3ea03b45e132d34d0bc7de93f196cbd3 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Thu, 18 Sep 2014 00:08:41 -0400 Subject: [PATCH 13/17] eh didn't work so well --- amelia.css | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/amelia.css b/amelia.css index 29faba4..bb3897a 100644 --- a/amelia.css +++ b/amelia.css @@ -4,6 +4,21 @@ body { background-repeat: repeat; } +.videoWrapper { + position: relative; + padding-bottom: 56.25%; /* 16:9 */ + padding-top: 25px; + height: 0; +} +.videoWrapper iframe { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + + .main { width: auto; padding-left:20%; @@ -20,16 +35,3 @@ body { } -.videoWrapper { - position: relative; - padding-bottom: 56.25%; /* 16:9 */ - padding-top: 25px; - height: 0; -} -.videoWrapper iframe { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} \ No newline at end of file From c26e5d0a6011c4f819c5eed40dc9a5091121e0ff Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Thu, 18 Sep 2014 00:24:19 -0400 Subject: [PATCH 14/17] again --- amelia.css | 32 +++++++++++++++----------------- index.html | 4 ++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/amelia.css b/amelia.css index bb3897a..8de9c6f 100644 --- a/amelia.css +++ b/amelia.css @@ -4,6 +4,21 @@ body { background-repeat: repeat; } +.main { + width: 100%; + padding-left:10%; + padding-right:10%; +} +.textbox { + position: relative; + font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; + font-color: ; + font-size: 18px; + width:75%; + height:60%; + background:black; +} + .videoWrapper { position: relative; padding-bottom: 56.25%; /* 16:9 */ @@ -18,20 +33,3 @@ body { height: 100%; } - -.main { - width: auto; - padding-left:20%; - padding-right:20%; -} -.textbox { - font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; - font-size: 18px; - width:610px; - height:600px; - background:yellow; - padding-left:.5%; - overflow:scroll; -} - - diff --git a/index.html b/index.html index 2d3690e..9c62330 100644 --- a/index.html +++ b/index.html @@ -14,9 +14,9 @@
    It is even easier to use legos watch this video to find out more:
    - + - +
    Directions:

    From 2bdeea97d392b77e02fd9976420c928dcd219716 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Thu, 18 Sep 2014 01:44:15 -0400 Subject: [PATCH 15/17] Ok I like it now --- amelia.css | 32 ++++++++++++++++++++++++-------- index.html | 21 +++++++++++---------- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/amelia.css b/amelia.css index 8de9c6f..96aa7db 100644 --- a/amelia.css +++ b/amelia.css @@ -1,27 +1,43 @@ body { background-image: url("http://inventioninbrooklyn.com/learning/Lego.jpg"); - background-position: 50% 50%; background-repeat: repeat; + margin-top: 0px; + margin-bottom:0px; } .main { - width: 100%; - padding-left:10%; - padding-right:10%; + 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; - font-color: ; + color: #FFFFFF; font-size: 18px; - width:75%; - height:60%; - background:black; +} + +.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; } diff --git a/index.html b/index.html index 9c62330..510aaec 100644 --- a/index.html +++ b/index.html @@ -10,23 +10,24 @@

    - Prototyping your circuits with breadboards is easy -
    It is even easier to use legos watch this video to find out more: + Prototyping your circuits with breadboards and legos: +
    + Directions: +
  • + pull off adhesive backing of breadboard +
  • + press flat lego onto it +
  • thats it!
    -
    - Directions: -

    -

  • - pull off adhesive backing of breadboard -
  • - press flat lego onto it -
  • thats it! +
    • + + \ No newline at end of file From 025fc82ba437d11f90bdc5238bb2b25756dc4cbc Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Wed, 24 Sep 2014 12:26:30 -0400 Subject: [PATCH 16/17] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 013706a..fe3f4db 100644 --- a/README.md +++ b/README.md @@ -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.) + +*Describe your project here +*[Amelia's Lego Breadboard](http://www.inventioninbrooklyn.com/learning/Project2/) From f73e4156958b9594c6bed573702635ccde22d476 Mon Sep 17 00:00:00 2001 From: Amelia Winger-Bearskin Date: Wed, 24 Sep 2014 12:26:45 -0400 Subject: [PATCH 17/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe3f4db..4f7cdb1 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,5 @@ 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.) -*Describe your project here + *[Amelia's Lego Breadboard](http://www.inventioninbrooklyn.com/learning/Project2/)