Browse files

it should be a nice dummy page now

  • Loading branch information...
1 parent b5f5289 commit 41df820b6586e5e9a716f8ea9536bf80a2593070 @pfefferle pfefferle committed Apr 3, 2012
Showing with 13 additions and 13 deletions.
  1. BIN assets/img/matthias.jpg
  2. +13 −13 index.html
View
BIN assets/img/matthias.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
26 index.html
@@ -48,9 +48,8 @@
<div class="hero-unit">
<h1>clean, lean and easy to use</h1>
- <p>12things is a project of Hannes Schippmann and Matthias Pfefferle. The goal of the project is to
- create simple software that don't make you think!</p>
- <p><iframe src="http://markdotto.github.com/github-buttons/github-btn.html?user=12sites&amp;type=follow"
+ <h2>12things is a project of <a href="#hannes">Hannes Schippmann</a> and <a href="#matthias">Matthias Pfefferle</a>. Our goal is to create software that doesn't make you think!!</h2>
+ <p><iframe src="http://markdotto.github.com/github-buttons/github-btn.html?user=12things&amp;type=follow"
allowtransparency="true" frameborder="0" scrolling="0" width="132px" height="20px"></iframe>
</p>
@@ -107,9 +106,9 @@ <h1 id="ideas">Ideas</h1>
<div class="row">
<div class="span6">
<h2>Human Markup</h2>
- <p>Actually there is no easy way for non-techies to mark up text on the internet. HTML and Mark-Down are too
- geeky and WYSIWYG-Editors are producing hacky code. With Human Markup we want to define some rules to mark up
- a normal text only by interpreting punctuation marks, paragraphs and apostrophes. If you want to join us,
+ <p>Actually, there is no easy way for non-techies to <em>mark up</em> text for the internet. HTML and mark-down are way too
+ geeky and WYSIWYG-editors are mainly producing bad code. With Human Markup we want to define some rules to <em>mark up</em>
+ normal text only by interpreting punctuation marks, paragraphs and apostrophes. If you want to help us,
please visit our <a href="https://github.com/12things/human-markup/wiki">wiki on Github</a>.</p>
<p><iframe src="http://markdotto.github.com/github-buttons/github-btn.html?user=12things&amp;repo=human-markup&amp;type=watch&amp;count=true"
allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe></p>
@@ -121,17 +120,18 @@ <h1 id="team">Team</h1>
</div>
<div class="row">
- <div class="span5">
+ <div class="span5" id="hannes">
<h2>Hannes Schippmann</h2>
- <img class="" src="./assets/img/hannes.jpg" style="float: right;">
- <p></p>
+ <img alt="Hannes Schippmann" src="./assets/img/hannes.jpg" style="float: right;">
+ <p>Hi. I am Hannes Schippmann. I build stuff. For the web. Using Ruby on Rails. <a href="http://hannes.schippmann.tv">Find out more.</a></p>
<p><iframe src="http://markdotto.github.com/github-buttons/github-btn.html?user=butschi&amp;type=follow&amp;count=true"
allowtransparency="true" frameborder="0" scrolling="0" width="132px" height="20px"></iframe> <a href="https://twitter.com/butschi" class="twitter-follow-button" data-show-count="false">Follow @butschi</a></p>
</div>
<div class="span2">&nbsp;</div>
- <div class="span5">
+ <div class="span5" id="matthias">
<h2>Matthias Pfefferle</h2>
- <p></p>
+ <img alt="Hannes Schippmann" src="./assets/img/matthias.jpg" style="float: right;">
+ <p>Hi. I am Matthias Pfefferle. I love prototyping with WordPress and I have a strong passion for the open web.</p>
<p><iframe src="http://markdotto.github.com/github-buttons/github-btn.html?user=pfefferle&amp;type=follow&amp;count=true"
allowtransparency="true" frameborder="0" scrolling="0" width="132px" height="20px"></iframe><a href="https://twitter.com/pfefferle" class="twitter-follow-button" data-show-count="false">Follow @pfefferle</a></p>
</div>
@@ -149,7 +149,7 @@ <h1 id="team">Team</h1>
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="./assets/js/jquery.js"></script>
+ <!--script src="./assets/js/jquery.js"></script>
<script src="./assets/js/bootstrap-transition.js"></script>
<script src="./assets/js/bootstrap-alert.js"></script>
<script src="./assets/js/bootstrap-modal.js"></script>
@@ -163,7 +163,7 @@ <h1 id="team">Team</h1>
<script src="./assets/js/bootstrap-collapse.js"></script>
<script src="./assets/js/bootstrap-carousel.js"></script>
- <script src="./assets/js/bootstrap-typeahead.js"></script>
+ <script src="./assets/js/bootstrap-typeahead.js"></script-->
<script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
</body>

0 comments on commit 41df820

Please sign in to comment.