From 5126e72b4a7f001b14ab3c443edc28fd0f2663fc Mon Sep 17 00:00:00 2001
From: Aidan Feldman
Date: Sat, 14 Sep 2013 00:57:53 -0400
Subject: [PATCH 1/8] add line re: non-code projects
---
index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/index.html b/index.html
index e2b5891..d23de3a 100644
--- a/index.html
+++ b/index.html
@@ -45,6 +45,6 @@ description: A site to provide non-judgmental guidance on choosing a license for
From a47bbeea43b5a3b49ffac404c744c1b6f50a7a9f Mon Sep 17 00:00:00 2001
From: Aidan Feldman
Date: Mon, 16 Sep 2013 15:16:10 -0400
Subject: [PATCH 2/8] make the additinal homepage questions side-by-side
---
css/application.css | 39 +++++++++++++++------------------------
index.html | 39 +++++++++++++++++++++++++++------------
2 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/css/application.css b/css/application.css
index f73cecd..67ffa69 100644
--- a/css/application.css
+++ b/css/application.css
@@ -190,37 +190,38 @@ strong {
top: 10px;
}
-.situations {
+.triptych {
width: 900px;
- margin: 0 auto;
+ margin: 0 auto 15px;
}
-.situations li {
+.triptych li {
width: 280px;
float: left;
margin-left: 27px;
text-align: center;
}
-.situations .whatever {
+.triptych li:first-child {
margin-left: 0;
- margin-top: 16px;
}
-.situations .copyleft {
- margin-top: 3px;
-}
-.situations h3 {
- margin: 0 auto 20px auto;
- width: 220px;
-}
-
-.situations h3 a {
+.triptych li > a {
text-decoration: none;
+}
+.triptych h3 {
color: #443a33;
font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
font-size: 22px;
font-weight: 900;
line-height: 1.1;
+ margin: 0 auto 20px auto;
+ width: 220px;
}
+.situations .whatever {
+ margin-top: 16px;
+}
+.situations .copyleft {
+ margin-top: 3px;
+}
.situations .button {
margin-top: 20px;
}
@@ -236,16 +237,6 @@ strong {
color: #5c5855;
padding: 16px;
}
-.see-more {
- margin-top: 20px;
- display: inline-block;
- padding-left: 80px;
- padding-right: 80px;
- font-weight: bold;
-}
-.see-more p:last-child {
- margin-bottom: 0.3em;
-}
.license-rules {
font-size: 13px;
diff --git a/index.html b/index.html
index d23de3a..24f6572 100644
--- a/index.html
+++ b/index.html
@@ -11,10 +11,12 @@ description: A site to provide non-judgmental guidance on choosing a license for
Which of the following best describes your situation?
}
-
-
-
+
+
+ I’m concerned about patents.
+
The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.
@@ -33,8 +37,10 @@ description: A site to provide non-judgmental guidance on choosing a license for
-
-
+
+
+ I care about sharing improvements.
+
The GPL (V2 or V3) is a copyleft license that requires anyone who distributes your code or a derivative work to make the source available under the same terms. V3 is similar to V2, but further restricts use in hardware that forbids software alterations.
@@ -43,8 +49,17 @@ description: A site to provide non-judgmental guidance on choosing a license for
-
+
From 837cb3e1d2bccfce233691925c9b0a2ddd0c4cbd Mon Sep 17 00:00:00 2001
From: Aidan Feldman
Date: Mon, 16 Sep 2013 15:17:02 -0400
Subject: [PATCH 3/8] reduce text in the homepage FAQ
---
index.html | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/index.html b/index.html
index 24f6572..f5b10b9 100644
--- a/index.html
+++ b/index.html
@@ -51,15 +51,21 @@ description: A site to provide non-judgmental guidance on choosing a license for
From 0177da529a89424a2103ce7b2ea9f0549d6b1ce8 Mon Sep 17 00:00:00 2001
From: Aidan Feldman
Date: Mon, 16 Sep 2013 15:17:53 -0400
Subject: [PATCH 4/8] reorder homepage questions
---
index.html | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/index.html b/index.html
index f5b10b9..26cc1b5 100644
--- a/index.html
+++ b/index.html
@@ -50,18 +50,18 @@ description: A site to provide non-judgmental guidance on choosing a license for
- -
-
What if none of these work for me?
-
- If you want to retain all your rights or have other requirements, more licenses are available.
-
-
-
What if my content isn't code?
Check out Creative Commons.
+ -
+
What if none of these work for me?
+
+ If you want to retain all your rights or have other requirements, more licenses are available.
+
+
-
What if I don't want to choose a license?
From b4e302a73cd23d8e2eecea1e1bfee72c2ff0cf42 Mon Sep 17 00:00:00 2001
From: Aidan Feldman
Date: Mon, 16 Sep 2013 15:38:22 -0400
Subject: [PATCH 5/8] increase vertical spacing between homepage questions
---
css/application.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/css/application.css b/css/application.css
index 67ffa69..579569a 100644
--- a/css/application.css
+++ b/css/application.css
@@ -192,7 +192,7 @@ strong {
.triptych {
width: 900px;
- margin: 0 auto 15px;
+ margin: 0 auto 35px;
}
.triptych li {
width: 280px;
From 6e91d6b529ef92a135991badd0a61d66d2b5d904 Mon Sep 17 00:00:00 2001
From: Aidan Feldman
Date: Mon, 16 Sep 2013 15:39:10 -0400
Subject: [PATCH 6/8] change text of second row homepage questions to be
consistent with the first
---
index.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/index.html b/index.html
index 26cc1b5..a3d7daf 100644
--- a/index.html
+++ b/index.html
@@ -51,19 +51,19 @@ description: A site to provide non-judgmental guidance on choosing a license for
-
-
What if my content isn't code?
+ My content isn't code.
Check out Creative Commons.
-
-
What if none of these work for me?
+ None of these work for me.
If you want to retain all your rights or have other requirements, more licenses are available.
-
-
What if I don't want to choose a license?
+ I don't want to choose a license.
You don't have to.
From f03c77d9fa6e94235d63cac65aa483c337db5bd0 Mon Sep 17 00:00:00 2001
From: Aidan Feldman
Date: Mon, 16 Sep 2013 15:42:21 -0400
Subject: [PATCH 7/8] separate first and second row of homepage questions
---
css/application.css | 2 +-
index.html | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/css/application.css b/css/application.css
index 579569a..1bdf655 100644
--- a/css/application.css
+++ b/css/application.css
@@ -192,7 +192,7 @@ strong {
.triptych {
width: 900px;
- margin: 0 auto 35px;
+ margin: 0 auto 20px;
}
.triptych li {
width: 280px;
diff --git a/index.html b/index.html
index a3d7daf..3c61d0c 100644
--- a/index.html
+++ b/index.html
@@ -49,6 +49,11 @@ description: A site to provide non-judgmental guidance on choosing a license for
+
+ {
+ What if none of these work for me?
+ }
+