From 9f1b7d0a4f531a4187861f1a3c620b97ac01ca92 Mon Sep 17 00:00:00 2001 From: house Date: Thu, 18 Jul 2013 15:27:04 -0700 Subject: [PATCH 01/12] add demo theme --- README.md | 5 ++ index.html | 67 +++++++++++++++++ stylesheets/styles.css | 161 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 README.md create mode 100644 index.html create mode 100644 stylesheets/styles.css diff --git a/README.md b/README.md new file mode 100644 index 0000000..04102c2 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +#Martin theme + +Showcase your content in style with Martin, a bold, timeless theme for GitHub pages. This work is licensed under a [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/). + +![Martin theme preview](https://f.cloud.github.com/assets/306877/822692/4620639e-eff5-11e2-9d41-2d67f9482c2b.png) diff --git a/index.html b/index.html new file mode 100644 index 0000000..efd984a --- /dev/null +++ b/index.html @@ -0,0 +1,67 @@ + + + + + + Martin theme by House + + + + + + + + +
+ +
+
Maintained by House
+
+ ZIP + • TAR + • View on GitHub +
+
+

Martin

+

Hello handsome! Present your project in style with this bold, timeless theme for GitHub pages.

+
+
+
+ +

Headline 1

+

Lorem ipsum dolor sit amet, eos te tation detraxit. Cu cum nibh dicta, no pro pertinacia philosophia, mel putant minimum an.

+ +

Headline 2

+

Lorem ipsum dolor sit amet, eos te tation detraxit. Cu cum nibh dicta, no pro pertinacia philosophia, mel putant minimum an.

+ 
+  def robot_invasion
+    puts("robot " * 1000)
+  end
+
+

Headline 3

+

Lorem ipsum dolor sit amet, eos te tation detraxit. Cu cum nibh dicta, no pro pertinacia philosophia, mel putant minimum an.

+

I, at any rate, am convinced that he does not throw dice.

+

Lorem ipsum dolor sit amet, eos te tation detraxit.

+

Headline 4

+

Lorem ipsum dolor sit amet, eos te tation detraxit. Cu cum nibh dicta, no pro pertinacia philosophia, mel putant minimum an. +

Headline 5
+

Lorem ipsum dolor sit amet, eos te tation detraxit. Cu cum nibh dicta, no pro pertinacia philosophia, mel putant minimum an. +

Headline 6
+

Lorem ipsum dolor sit amet, eos te tation detraxit. Cu cum nibh dicta, no pro pertinacia philosophia, mel putant minimum an. + +

+ +
+ + \ No newline at end of file diff --git a/stylesheets/styles.css b/stylesheets/styles.css new file mode 100644 index 0000000..0957b3c --- /dev/null +++ b/stylesheets/styles.css @@ -0,0 +1,161 @@ +@import url(http://fonts.googleapis.com/css?family=OpenSans:100italic,700italic,100,700); +@import url(http://fonts.googleapis.com/css?family=Playfair+Display:900italic,900); + +#wrapper { max-width: 650px; margin: 50px auto; padding: 60px 9%; margin-top: 50px; background: #fff} + + +body { + font: 100 18px/1.5em 'Open Sans', "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif; + background: #eee; + margin: 0; +} + + +a { text-decoration: none; color: inherit; border-bottom: 1px solid #ddd;} +a:hover {border-bottom: 1px solid #222;} +em {font-style: italic;} +strong {font-weight: bold;} +h1, h2, h3, h4, h5, h6 { + color: #222; + font-family: 'Playfair Display', "Didot LT STD", "Hoefler Text", Garamond, "Times New Roman", serif; margin: 1em 0; + font-weight: 900; +} +h1 { font-size: 2em; line-height: 1.16em;} +h2 { font-size: 1.55em; line-height: 1.16em;} +h3 { font-size: 1.16em; } +h4 { font-size: 1em; text-transform: uppercase; letter-spacing: 0.15em; } +h5 { font-size: 0.78em; text-transform: uppercase; letter-spacing: 0.15em; } +h6 { font-size: 0.67em; text-transform: uppercase; letter-spacing: 0.15em; } +p, ul, pre, table, dl { margin: 0; color: #888; margin-bottom: 1em; } +code, pre { font-size: 16px; color: #222;} +blockquote { border-left: 2px solid #222; padding-left: 2em; margin: 0;font-size: 0.875em;} +table {width: 100%; } +th, td { padding: 1em; text-align: center;} +th { + border-bottom: 1px solid #222; + font-weight: 100; + text-transform: uppercase; + letter-spacing: 0.2em; + font-size:0.7em; + text-align: center; + color: #222; +} +dt {margin-top: 0.5em;color:#888;font-weight:700;} +dt:first-child {margin-top:0;} +dd {margin-left: 1em;} +hr { + border: 0; + height: 2px; + display: block; + margin: 4em auto; + background: #222; +} + + +header, section, footer, a {transition: 0.2s;} + +header { + clear: both; + padding-bottom: 3em; + padding-top: 1px; + border-bottom: 3px solid #222; +} + +header a {border-bottom: 1px solid #fff;} + +.byline { float: left; } +.byline a { + color: #888; + text-align: center; + font-size: 0.7em; + text-transform: uppercase; + letter-spacing: 0.1em; + text-align: left; + font-weight: 100; +} + +.downloads { float: right; } +.downloads a { + margin: 0 1em; + color: #888; + text-align: center; + font-size: 0.7em; + text-transform: uppercase; + letter-spacing: 0.1em; + font-weight: 100; +} + +header hgroup { + clear: both; + border-top: 4px solid #222; + margin-top: 3em; +} + +header h1 { + margin: 0; + margin-top: 1px; + padding-top: 1.5em; + font-family: 'Playfair Display', "Didot LT STD", "Hoefler Text", Garamond, "Times New Roman", serif; + line-height: 1.33em; + font-style: italic; + font-size: 5em; + border-top: 1px solid #222; +} + +.tagline { + margin:0; + margin-top: 1.25em; + font-family: 'Playfair Display', "Didot LT STD", "Hoefler Text", Garamond, "Times New Roman", serif; + line-height:1.5em; + color: #222; +} + +section { + padding-top: 5em; + padding-bottom: 4em; + border-bottom: 4px solid #222; + margin-top: 1px; +} + +section h1:first-child {margin-top: 0;} + +footer { + margin-top: 1px; + padding-top: 3em; + overflow: auto; + text-align: center; + font-size: 0.7em; + text-transform: uppercase; + letter-spacing: 0.1em; + border-top: 1px solid #222; +} + +footer a { border: 0; margin: 0 0.5em; color: #888; } + +@media print { + body {font-size: 12px;} + header {border: 0;padding: 0; margin: 0; text-align: center;} + .downloads, .byline, footer {display: none;} + header hgroup {border: 0;padding:0; margin: 0;} + header h1 {margin: 0; padding: 0; font-size: 3em;border: 0;} + header h2 {border: 0; margin: 0;} + .downloads, footer {display:none;} + section {border: 0;} +} + +@media screen and (max-width: 650px) { + body {font-size: 16px; background: #fff;} + #wrapper {margin: 0px; padding: 0;} + .byline, .downloads {float: none; text-align: center; } + .downloads a:first-child {margin-left: 0;} + header {padding: 2em;} + header hgroup {text-align:center;border: 0;margin:0;} + header h1 {font-size:3em;border: 0;padding:0;padding-top:0.5em;} + .tagline {border: 0;margin-top: 0.5em;} + header div {border: 0;} + section, footer {padding: 2em;} + footer p {width: 100%; float: none;} + footer p:last-child {text-align: left;} + + +} From 19ffcc9bbb01c97e85718d5bb448bcc889694126 Mon Sep 17 00:00:00 2001 From: house Date: Thu, 18 Jul 2013 15:27:04 -0700 Subject: [PATCH 02/12] add demo theme --- stylesheets/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylesheets/styles.css b/stylesheets/styles.css index a4c9340..ed1a3ae 100644 --- a/stylesheets/styles.css +++ b/stylesheets/styles.css @@ -171,4 +171,4 @@ footer { section, footer { padding: 2em; } footer p { width: 100%; float: none; } footer p:last-child { text-align: left; } -} \ No newline at end of file +} From fe59d413bcc262af5ec52311d418da2211539bb5 Mon Sep 17 00:00:00 2001 From: house Date: Sun, 15 Sep 2013 08:45:21 -0700 Subject: [PATCH 03/12] update preview image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ac8922..5aea707 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ Showcase your content in style with Martin, a bold, timeless theme for GitHub pages! Named for the punchcutter William Martin, apprentice to John Baskerville. This work is licensed under a [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/). Check out the [live demo](http://house.github.io/martin/). -![Martin theme preview](https://f.cloud.github.com/assets/306877/822692/4620639e-eff5-11e2-9d41-2d67f9482c2b.png) +![Martin theme preview](https://f.cloud.github.com/assets/306877/1145554/bddcfe0a-1e1d-11e3-998c-171657eb1054.png) From 053f9cc4411dad4f966e3cf9c7f2acd340c0fd4d Mon Sep 17 00:00:00 2001 From: house Date: Sun, 15 Sep 2013 08:54:12 -0700 Subject: [PATCH 04/12] update for consistent language --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5aea707..0eadf62 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ #Martin theme -Showcase your content in style with Martin, a bold, timeless theme for GitHub pages! Named for the punchcutter William Martin, apprentice to John Baskerville. This work is licensed under a [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/). Check out the [live demo](http://house.github.io/martin/). +Showcase your project in style with Martin, a bold, timeless theme for GitHub pages! Named for the punchcutter William Martin, apprentice to John Baskerville. This work is licensed under a [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/). Check out the [live demo](http://house.github.io/martin/). ![Martin theme preview](https://f.cloud.github.com/assets/306877/1145554/bddcfe0a-1e1d-11e3-998c-171657eb1054.png) From a2443d17caa2397216bf9fce42b774f83c2c29c2 Mon Sep 17 00:00:00 2001 From: house Date: Sun, 15 Sep 2013 10:39:26 -0700 Subject: [PATCH 05/12] add authorship --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index c0cfa44..4cee5a9 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - Martin Theme by House + Martin Theme by Allison House @@ -80,4 +80,4 @@
And here's the last one
- \ No newline at end of file + From 2447b14c2718aa7256d462a6c12c2f9418f79adf Mon Sep 17 00:00:00 2001 From: Victor Costan Date: Mon, 16 Sep 2013 15:39:03 -0700 Subject: [PATCH 07/12] OCD: spacing --- stylesheets/styles.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/stylesheets/styles.css b/stylesheets/styles.css index ed1a3ae..17b2bae 100644 --- a/stylesheets/styles.css +++ b/stylesheets/styles.css @@ -32,7 +32,7 @@ th { font-weight: 100; text-transform: uppercase; letter-spacing: 0.2em; - font-size:0.7em; + font-size: 0.7em; text-align: center; color: #222; } @@ -151,10 +151,10 @@ footer { body { font-size: 12px; } header { border: 0;padding: 0; margin: 0; text-align: center; } .downloads, .byline, footer { display: none; } - header hgroup { border: 0;padding:0; margin: 0; } - header h1 { margin: 0; padding: 0; font-size: 3em;border: 0; } + header hgroup { border: 0; padding: 0; margin: 0; } + header h1 { margin: 0; padding: 0; font-size: 3em; border: 0; } header h2 { border: 0; margin: 0; } - .downloads, footer { display:none; } + .downloads, footer { display: none; } section { border: 0; } } @@ -164,9 +164,9 @@ footer { .byline, .downloads {float: none; text-align: center; } .downloads a:first-child {margin-left: 0; } header { padding: 2em; } - header hgroup { text-align:center;border: 0;margin:0; } - header h1 { font-size:3em;border: 0;padding:0;padding-top:0.5em; } - .tagline { border: 0;margin-top: 0.5em; } + header hgroup { text-align: center; border: 0; margin: 0; } + header h1 { font-size: 3em; border: 0; padding: 0; padding-top: 0.5em; } + .tagline { border: 0; margin-top: 0.5em; } header div { border: 0; } section, footer { padding: 2em; } footer p { width: 100%; float: none; } From eed59b6565bcfcdd070132307db370ecc46317e4 Mon Sep 17 00:00:00 2001 From: house Date: Sun, 22 Sep 2013 09:50:05 -0700 Subject: [PATCH 08/12] add google analytics js --- index.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/index.html b/index.html index 81a18ac..07a4476 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,15 @@ +
From 8655612c42a05019b4897abb06e423b34ae89b23 Mon Sep 17 00:00:00 2001 From: house Date: Mon, 23 Sep 2013 09:41:17 -0700 Subject: [PATCH 09/12] move ga script to body --- index.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index 07a4476..ca96f3a 100644 --- a/index.html +++ b/index.html @@ -9,15 +9,6 @@ -
@@ -88,5 +79,14 @@
And here's the last one

"Martin" by Allison House

+ From b7e249462659e3751cf517e762c10a2c160f6a91 Mon Sep 17 00:00:00 2001 From: Allison House Date: Wed, 9 Apr 2014 20:33:01 -0700 Subject: [PATCH 10/12] update analytics for new domain --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index ca96f3a..6f2f5a8 100644 --- a/index.html +++ b/index.html @@ -84,8 +84,8 @@
And here's the last one
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - - ga('create', 'UA-6984438-12', 'house.github.io'); + + ga('create', 'UA-46390682-1', 'allison.house'); ga('send', 'pageview'); From 583c056a3d40cad8de7fcb08af28dc23cd362ffe Mon Sep 17 00:00:00 2001 From: Allison House Date: Tue, 28 Jul 2015 16:09:53 -0500 Subject: [PATCH 11/12] update analytics --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index ca96f3a..9545f01 100644 --- a/index.html +++ b/index.html @@ -85,8 +85,9 @@
And here's the last one
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - ga('create', 'UA-6984438-12', 'house.github.io'); + ga('create', 'UA-65707739-1', 'auto'); ga('send', 'pageview'); + From a24a9a46bd1655f77c73c5dd0af03cfb4d1e4ef0 Mon Sep 17 00:00:00 2001 From: Allison House Date: Tue, 28 Jul 2015 16:18:36 -0500 Subject: [PATCH 12/12] merge fix --- index.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/index.html b/index.html index ea63980..6294151 100644 --- a/index.html +++ b/index.html @@ -84,13 +84,7 @@
And here's the last one
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); -<<<<<<< HEAD - ga('create', 'UA-65707739-1', 'auto'); -======= - - ga('create', 'UA-46390682-1', 'allison.house'); ->>>>>>> b7e249462659e3751cf517e762c10a2c160f6a91 ga('send', 'pageview');