Skip to content

asd #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yamil777 wants to merge 15 commits into
base: master
Choose a base branch
from
Open

asd #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9f1b7d0
add demo theme
house Jul 18, 2013
0fac28a
Merge branch 'master' into gh-pages
house Jul 19, 2013
19ffcc9
add demo theme
house Jul 18, 2013
1a71f37
Merge branch 'gh-pages' of https://github.com/house/martin into gh-pages
house Sep 15, 2013
fe59d41
update preview image
house Sep 15, 2013
053f9cc
update for consistent language
house Sep 15, 2013
a2443d1
add authorship
house Sep 15, 2013
2f172e6
Import a stable version of html5shiv
pwnall Sep 16, 2013
2447b14
OCD: spacing
pwnall Sep 16, 2013
eed59b6
add google analytics js
house Sep 22, 2013
8655612
move ga script to body
house Sep 23, 2013
b7e2494
update analytics for new domain
house Apr 10, 2014
583c056
update analytics
house Jul 28, 2015
41ed4f3
update analytics
house Jul 28, 2015
a24a9a4
merge fix
house Jul 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/822692/4620639e-eff5-11e2-9d41-2d67f9482c2b.png)
![Martin theme preview](https://f.cloud.github.com/assets/306877/1145554/bddcfe0a-1e1d-11e3-998c-171657eb1054.png)
17 changes: 13 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>Martin Theme by House</title>
<title>Martin Theme by Allison House</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="stylesheets/styles.css">
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.2/html5shiv.js"></script>
Copy link
Author

@yamil777 yamil777 May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

esto no esta del todo correcto

asi:

<![endif]-->
</head>
<body>
Expand All @@ -26,7 +26,7 @@ <h2 class="tagline">Showcase your project in style with this bold, timeless them
</header>
<section>
<h1>About Martin</h1>
<p>Martin is a GitHub pages theme named for the punchcutter William Martin. To use it, just <a href="https://github.com/house/martin/fork">fork this project</a> and replace my content with your own. This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License.</a></p>
<p>Martin is a GitHub pages theme by <a href="http://twitter.com/house">Allison House</a>, named for the punchcutter William Martin. To use it, just <a href="https://github.com/house/martin/fork">fork this project</a> and replace my content with your own. This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License.</a></p>
<h1>Style examples</h1>
<h2>Blockquote</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
Expand Down Expand Up @@ -79,5 +79,14 @@ <h6>And here's the last one</h6>
<p><a href="http://house.github.io/martin">"Martin"</a> by <a href="http://twitter.com/house">Allison House</a></p>
</footer>
</div>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(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-65707739-1', 'auto');
ga('send', 'pageview');

</script>
</body>
</html>
</html>
16 changes: 8 additions & 8 deletions stylesheets/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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; }
}

Expand All @@ -164,11 +164,11 @@ 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; }
footer p:last-child { text-align: left; }
}
}