Permalink
Browse files

Merge branch 'master' of git://github.com/gewgaws/git-for-writers

  • Loading branch information...
brendateruel committed Mar 22, 2010
2 parents 32005e7 + 4d5acc9 commit 6932efc41c0d1f98e983f2f27b80583e003c31cd
Showing with 159 additions and 8 deletions.
  1. +1 −1 about.htm
  2. +34 −1 css/screen.css
  3. +120 −2 index.htm
  4. +1 −1 participate.htm
  5. +1 −1 prototype.htm
  6. +1 −1 resources.htm
  7. +1 −1 style-guide.htm
View
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Page Title: Site Name</title>
+ <title>Git for Writers: About the Project</title>
<link rel="stylesheet" type="text/css" media="screen, print" href="css/reset.css" />
<link rel="stylesheet" type="text/css" media="screen" href="css/screen.css" />
View
@@ -62,6 +62,7 @@ div#supporting {
/* Footer */
div#footer {
+ clear: both;
border-top: 1px dotted black;
padding-top: 1em;
padding-bottom: 1em;
@@ -125,10 +126,16 @@ div#content ol {
line-height: 1.5;
padding-bottom: 1em;
}
-
+div#content ul li {
+ list-style-type: disc;
+ margin-left: 4ex;
+ margin-top: 1em;
+}
/*Content Typography: Headings*/
div#content h2 {
font-size: 150%;
+ margin-top: 1em;
+ margin-bottom: .5em;
}
div#content h3 {
font-size: 130%;
@@ -183,6 +190,31 @@ div#content a:hover,
div#content a:focus {
}
+/*Home Page*/
+div#content ul#project-overview li {
+ list-style-type: none;
+ margin-left: 0;
+ margin-top: 0;
+}
+
+li#alone,
+li#wherever,
+li#together {
+ width: 210px;
+ padding: 5px;
+ float: left;
+ background-color: #CCDDFF;
+}
+li#wherever { background-color: #FFF; }
+li.concepts,
+li.hands-on,
+li.scenarios {
+ min-height: 250px;
+}
+
+
+
+
/*Git*/
samp,pre,kbd,code {
font-family: Monaco, "Lucida Console", "Courier New", Courier, mono;
@@ -191,6 +223,7 @@ samp,pre,kbd,code {
background-color: black;
color: white;
}
+pre,code { margin: 1em 0em; }
code {
background-color: #EEE;
color: black;
View
122 index.htm
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Page Title: Site Name</title>
+ <title>Git for Writers</title>
<link rel="stylesheet" type="text/css" media="screen, print" href="css/reset.css" />
<link rel="stylesheet" type="text/css" media="screen" href="css/screen.css" />
@@ -55,7 +55,125 @@ <h1><a href="http://gewga.ws/git-for-writers/" rel="home">Git for Writers</a></h
<div id="content">
<div id="main">
- <h2>Git for Writers</h2>
+ <h2>A Different Approach to Revision and Collaboration</h2>
+ <p>
+ <strong>Git for Writers</strong> introduces the free and open source distributed
+ content versioning system Git specifically for digital writers. Although Git is
+ originally a tool for software development, it can be used to track history and
+ open up the writing process for any digital formats that are plain text,
+ including XHTML/HTML, XML, CSS, JavaScript, and even templating systems in PHP
+ (e.g., WordPress or Drupal).
+ </p>
+ <p>
+ But Git is more than just another tool, however. It suggests an entirely
+ different model of revision and version tracking than track-changes
+ features in word processors. Git and related services, such as GitHub, also offer
+ a model of collaboration that is much more expansive and scalable than wikis.
+ </p>
+ <p>
+ <strong>Git for Writers</strong> is structured to support writers working alone,
+ perhaps on different computers (e.g., a laptop and a desktop or wherever),
+ as well as multiple writers working together. For each writing situation,
+ <strong>Git for Writers</strong> offers a set of concepts, practical hands-on use
+ of Git and related services, and three sample scenarios for how Git can change the
+ <ul id="project-overview">
+ <li id="alone"><h3>Alone</h3>
+ <ul>
+ <li class="concepts">
+ <h4>Concepts</h4>
+ <ol>
+ <li>Git Versus Track Changes</li>
+ <li>Maintaining History</li>
+ <li>Possible Futures</li>
+ <li>Test Like Nobody’s Watching</li>
+ </ol>
+ </li>
+ <li class="hands-on">
+ <h4>Hands-On</h4>
+ <ol>
+ <li>Git Setups</li>
+ <li>Creating a New Project</li>
+ <li>Staging a Commit</li>
+ <li>Making a Commit</li>
+ <li>Reviewing History</li>
+ <li>Rolling Back</li>
+ <li>Branching Sideways</li>
+ </ol>
+ </li>
+ <li class="scenarios">
+ <h4>Scenarios</h4>
+ <ol>
+ <li>Plain Text To-Do List</li>
+ <li>Personal Web Site</li>
+ <li>WordPress Template</li>
+ </ol>
+ </li>
+ </ul>
+ </li>
+ <li id="wherever"><h3>Wherever</h3>
+ <ul>
+ <li class="concepts">
+ <h4>Concepts</h4>
+ <ol>
+ <li>Git Versus Emailed Files</li>
+ <li>Into the Woods...</li>
+ <li>One Project, Many Machines</li>
+ <li>Starting from Other Than Scratch</li>
+ <li>...Back to Civilization</li>
+ <li>Public/Private</li>
+ </ol>
+ </li>
+ <li class="hands-on">
+ <h4>Hands-On</h4>
+ <ol>
+ <li>GitHub Setup</li>
+ <li>Pushing</li>
+ <li>Pulling</li>
+ <li>Branching</li>
+ <li>Tagging</li>
+ </ol>
+ </li>
+ <li class="scenarios">
+ <h4>Scenarios</h4>
+ <ol>
+ <li>Remote Backup (By Default)</li>
+ <li>Research and Writing</li>
+ <li>Managing Website Updates</li>
+ </ol>
+ </li>
+ </ul>
+ </li>
+ <li id="together"><h3>Together</h3>
+ <ul>
+ <li class="concepts">
+ <h4>Concepts</h4>
+ <ol>
+ <li>Git Versus Wiki</li>
+ <li>Everybody’s Everything</li>
+ <li>Optimistic Locking</li>
+ <li>Conflict Resolution</li>
+ </ol>
+ </li>
+ <li class="hands-on">
+ <h4>Hands-On</h4>
+ <ol>
+ <li>GitHub: Forking</li>
+ <li>GitHub: Collaborators</li>
+ <li>Tracking Branches</li>
+ <li>Pull Requests</li>
+ </ol>
+ </li>
+ <li class="scenarios">
+ <h4>Scenarios</h4>
+ <ol>
+ <li>Organization Website</li>
+ <li>Collaborative Essay</li>
+ <li>Git for Writers</li>
+ </ol>
+ </li>
+ </ul>
+ </li>
+ </ul>
</div>
<div id="supporting">
View
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Page Title: Site Name</title>
+ <title>Git for Writers: Participate</title>
<link rel="stylesheet" type="text/css" media="screen, print" href="css/reset.css" />
<link rel="stylesheet" type="text/css" media="screen" href="css/screen.css" />
View
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Page Title: Site Name</title>
+ <title>Git for Writers: Page Title Here</title>
<link rel="stylesheet" type="text/css" media="screen, print" href="css/reset.css" />
<link rel="stylesheet" type="text/css" media="screen" href="css/screen.css" />
View
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Page Title: Site Name</title>
+ <title>Git for Writers: Git Resources and References</title>
<link rel="stylesheet" type="text/css" media="screen, print" href="css/reset.css" />
<link rel="stylesheet" type="text/css" media="screen" href="css/screen.css" />
View
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Page Title: Site Name</title>
+ <title>Git for Writers: Style Guide</title>
<link rel="stylesheet" type="text/css" media="screen, print" href="css/reset.css" />
<link rel="stylesheet" type="text/css" media="screen" href="css/screen.css" />

0 comments on commit 6932efc

Please sign in to comment.