From 945ca602808378546af658ab91d8f3c019b5f5ba Mon Sep 17 00:00:00 2001 From: Briana Swift Date: Mon, 3 Apr 2017 09:55:26 -0500 Subject: [PATCH 1/6] write note about merge conflicts in readme --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ff56cbd..9835e3e 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,15 @@ --- This playable post is [public domain (CC0)](http://creativecommons.org/publicdomain/zero/1.0). - + +This repository also has some baked in merge conflicts for practice. + Please feel free to use this in your classrooms, make video/picture/text adaptations, or modify the source code! Attribution is not mandatory, but super appreciated. -We are [Vi Hart](http://vihart.com/) and [Nicky Case](http://ncase.me/). - +We are [Vi Hart](http://vihart.com/) and [Nicky Case](http://ncase.me/). + Show us how you're using and remixing Parable of the Polygons! Tweet us at [@vihartvihart](https://twitter.com/vihartvihart) and From a1a0c9d3288926933e1dfdf10a325298f9389f2f Mon Sep 17 00:00:00 2001 From: Briana Swift Date: Mon, 3 Apr 2017 09:55:58 -0500 Subject: [PATCH 2/6] add info about practicing Git and GitHub to readme --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ff56cbd..feca28a 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,15 @@ --- This playable post is [public domain (CC0)](http://creativecommons.org/publicdomain/zero/1.0). - + +This repository is also being used as a part of GitHub training, to practice Git and GitHub. + Please feel free to use this in your classrooms, make video/picture/text adaptations, or modify the source code! Attribution is not mandatory, but super appreciated. -We are [Vi Hart](http://vihart.com/) and [Nicky Case](http://ncase.me/). - +We are [Vi Hart](http://vihart.com/) and [Nicky Case](http://ncase.me/). + Show us how you're using and remixing Parable of the Polygons! Tweet us at [@vihartvihart](https://twitter.com/vihartvihart) and From 9c84271096ca2eedb5bef5374776bf11d31e5dba Mon Sep 17 00:00:00 2001 From: Briana Swift Date: Mon, 3 Apr 2017 10:04:54 -0500 Subject: [PATCH 3/6] change title on manual simulation --- play/manual/manual.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/play/manual/manual.html b/play/manual/manual.html index a79915b..c118316 100644 --- a/play/manual/manual.html +++ b/play/manual/manual.html @@ -1,7 +1,7 @@ - Manual Simulation + This is a Manual Simulation @@ -12,4 +12,4 @@ - \ No newline at end of file + From 9320b58619ef77591df5f78eb21deaa1844f52e3 Mon Sep 17 00:00:00 2001 From: Briana Swift Date: Mon, 3 Apr 2017 10:06:11 -0500 Subject: [PATCH 4/6] change wording in mini_bored --- play/mini/mini_bored.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/play/mini/mini_bored.html b/play/mini/mini_bored.html index 53f86ca..19c9871 100644 --- a/play/mini/mini_bored.html +++ b/play/mini/mini_bored.html @@ -8,7 +8,7 @@
meh: - all neighbors are like me. (also meh if i've got no neighbors) + Either I have no neighbors, or all of my neighbors are like me. Meh.
- \ No newline at end of file + From 3f3aaf1b84ba0d587871cb1852d089829d6f46e2 Mon Sep 17 00:00:00 2001 From: Briana Swift Date: Mon, 3 Apr 2017 10:07:50 -0500 Subject: [PATCH 5/6] expand hex colors of urls --- css/index.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/css/index.css b/css/index.css index 4e19e97..5c2c984 100644 --- a/css/index.css +++ b/css/index.css @@ -16,10 +16,10 @@ body{ } a{ - color: #999; + color: #999999; } a:hover{ - color: #ddd; + color: #dddddd; } #intro_container, #outro_container{ @@ -108,11 +108,11 @@ span[cartoon]:hover{ } #cartoon_arrow{ - + display: block; - width: 0; - height: 0; + width: 0; + height: 0; border-left: 10px solid transparent; border-right: 10px solid transparent; border-bottom: 20px solid #fff; @@ -123,11 +123,11 @@ span[cartoon]:hover{ } #cartoon_arrow[flipped=true]{ - + display: block; - width: 0; - height: 0; + width: 0; + height: 0; border-left: 10px solid transparent; border-right: 10px solid transparent; border-bottom: 20px solid #fff; @@ -136,4 +136,4 @@ span[cartoon]:hover{ top:-20px; left:140px; -} \ No newline at end of file +} From 1095c8c8e4eb14cbcd68e7302818e5c8e1b2c107 Mon Sep 17 00:00:00 2001 From: Briana Swift Date: Mon, 3 Apr 2017 10:11:06 -0500 Subject: [PATCH 6/6] commenting out url colors --- css/index.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/css/index.css b/css/index.css index 5c2c984..b716bf9 100644 --- a/css/index.css +++ b/css/index.css @@ -15,12 +15,14 @@ body{ } -a{ + +/**a{ color: #999999; } a:hover{ color: #dddddd; } +**/ #intro_container, #outro_container{ width:100%; height:550px;