Merge branch 'master' into gh-pages

mdo · mdo · commit 989e5c2eddc7 · 2013-12-28T11:33:08.000-08:00
diff --git a/404.html b/404.html
@@ -44,13 +44,11 @@ <h1>Hyde</h1>
     </header>
 
     <div class="content container">
-      <div class="fourohfour">
-        <h1>404: Page not found</h1>
-        <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="/">Visit the home page</a> to see if you can find it manually. Thanks!</p>
-        <hr>
-        <h3>Heads up!</h3>
-        <p>This is a basic 404 page for use with GitHub Pages. It's source code is not generated by Jekyll.</p>
-      <div>
+      <h1>404: Page not found</h1>
+      <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="/">Visit the home page</a> to see if you can find it manually. Thanks!</p>
+      <hr>
+      <h3>Heads up!</h3>
+      <p>This is a basic 404 page for use with GitHub Pages. It's source code is not generated by Jekyll.</p>
     </div>
 
   </body>
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 An elegant open source, mobile first theme for [Jekyll](https://github.com/mojombo/jekyll). It includes lightweight styles and placeholder content to get you up and running with a simple blog in no time.
 
-![Hyde screenshot](https://f.cloud.github.com/assets/98681/1330948/de10196c-353f-11e3-86d0-8e967dd95722.png)
+![Hyde screenshot](https://f.cloud.github.com/assets/98681/1818325/da6489d8-6ff5-11e3-9b4f-c56b92013e9a.png)
 
 
 ## Usage
@@ -46,7 +46,7 @@ Hyde includes a few options, typically applied via classes on the `<body>` eleme
 
 As of v1.1, Hyde ships with optional themes based on the [base16 color scheme](https://github.com/chriskempson/base16). In Hyde, a theme simply changes the sidebar's background color and the color of links within blog posts. Here's the red theme in action:
 
-![Hyde in red](https://f.cloud.github.com/assets/98681/1817043/e59dc31a-6f68-11e3-9d90-2508314934df.png)
+![Hyde in red](https://f.cloud.github.com/assets/98681/1818326/da64f56c-6ff5-11e3-9643-7d0c18157dec.png)
 
 There are eight themes available at this time.
 
@@ -60,10 +60,12 @@ To use a theme, add anyone of the available theme classes to the `<body>` elemen
 </body>
 ```
 
-To create your own theme, look to the Themes section of [Hyde's CSS](/mdo/hyde/blob/master/public/css/hyde.css). Copy any existing theme (they're only a few lines of CSS), rename it, and change the provided colors.
+To create your own theme, look to the Themes section of [Hyde's CSS](https://github.com/mdo/hyde/blob/master/public/css/hyde.css). Copy any existing theme (they're only a few lines of CSS), rename it, and change the provided colors.
 
 ### Reverse layout
 
+![Hyde with reverse layout](https://f.cloud.github.com/assets/98681/1818324/da6473f8-6ff5-11e3-9315-692e639fb5c7.png)
+
 Hyde's page orientation can be reversed with a single class.
 
 ```html
diff --git a/_config.yml b/_config.yml
@@ -2,7 +2,7 @@ title:        Hyde
 tagline:      'Hyde, a Jekyll theme'
 description:  'An elegant open source and mobile first theme for <a href="http://jekyllrb.com" target="_blank">Jekyll</a>. Made by <a href="https://twitter.com/mdo" target="_blank">@mdo</a>.'
 url:          http://andhyde.com
-version:      1.1.0
+version:      1.1.1
 author:
   name:       ''
   email:      ''
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -20,7 +20,7 @@ <h1>{{ site.title }}</h1>
             </li>
             <li>Currently v{{ site.version }}</li>
           </ul>
-          <p>&copy; 2013. {{ site.author.name }} All rights reserved.</p>
+          <p>&copy; 2014. {{ site.author.name }} All rights reserved.</p>
         </div>
       </div>
     </header>
diff --git a/_posts/2012-02-08-hello-world.md b/_posts/2012-02-08-hello-world.md
diff --git a/_posts/2013-12-28-hello-world.md b/_posts/2013-12-28-hello-world.md
@@ -0,0 +1,28 @@
+---
+layout: post
+title: Hello, world!
+---
+
+Welcome to [Hyde](http://andhyde.com), the perfect companion to [Jekyll](http://jekyllrb.com), the popular static site generator. Hyde is an elegant, open source, mobile first theme for Jekyll. It includes lightweight styles and placeholder content to get you up and running with a simple blog in no time.
+
+### Features
+
+* Complete Jekyll setup included (layouts, config, 404, RSS feed, posts, and page)
+* [Eight optional color schemes](https://github.com/mdo/hyde#themes), available via `<body>` classes
+* Two orientations for content and sidebar, default (left sidebar) and [reverse](https://github.com/mdo/hyde#reverse-layout) (right sidebar), available via `<body>` classes
+* Mobile first design and development, so it works great on all devices
+* Support for a wide gamut of HTML elements
+* Related posts (time-based, because Jekyll) below each post
+* Syntax highlighting, courtesy Pygments (the Python-based code snippet highlighter)
+
+### Browser support
+
+Hyde is a rather forward-thinking project. In addition to the latest versions of Chrome, Safari (mobile and desktop), and Firefox, it is only compatible with Internet Explorer 9 and above.
+
+### Documentation
+
+Docs for setting up and customizing Hyde can be found in the [project readme on GitHub](https://github.com/mdo/hyde#readme).
+
+### Download
+
+Find out more and [download a copy](https://github.com/mdo/hyde) today from GitHub.
diff --git a/public/css/hyde.css b/public/css/hyde.css
@@ -95,9 +95,6 @@ p {
 ul, ol {
   margin-bottom: 15px;
 }
-li {
-  color: #888580;
-}
 
 hr {
   position: relative;
@@ -123,24 +120,23 @@ abbr {
   border-radius: 3px;
 }
 
-code, pre {
-  padding: 0 3px 2px;
+code,
+pre {
   font-family: Menlo, Monaco, "Courier New", monospace;
-  font-size: 14px;
-  border-radius: 3px;
 }
 code {
-  padding: 2px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
+  padding: .25em .5em;
+  font-size: 85%;
+  color: #bf616a;
+  background-color: #f9f9f9;
+  border-radius: 3px;
 }
-
 pre {
   display: block;
   margin: 0 0 14px;
   padding: 15px 20px;
-  line-height: 28px;
+  font-size: 16px;
+  line-height: 1.4;
   white-space: pre;
   white-space: pre-wrap;
   word-break: break-all;
@@ -149,9 +145,9 @@ pre {
 }
 pre code {
   padding: 0;
+  font-size: 100%;
   color: inherit;
   background-color: transparent;
-  border: 0;
 }
 .highlight {
   margin-bottom: 15px;
@@ -251,7 +247,6 @@ a:focus {
 /* Footer area of masthead */
 .colophon {
   margin-top: 20px;
-  color: #fff;
   color: rgba(255,255,255,.5);
 }
 .colophon-links {
@@ -299,12 +294,19 @@ a:focus {
  * with a 25%-wide `.masthead`.
  */
 
+.content {
+  padding: 40px 20px;
+}
+
 /* Center container in available real estate */
 @media (min-width: 990px) {
+  .content {
+    padding: 60px 0;
+  }
   .container {
+    width: 55%;
     margin-left: 35%;
     margin-right: 10%;
-    width: 55%;
   }
 }
 
@@ -317,12 +319,11 @@ a:focus {
 
 /* Single post */
 .post {
-  margin: 40px 20px;
+  margin-bottom: 40px;
 }
 @media (min-width: 990px) {
-  /* Increase space between posts */
   .post {
-    margin: 60px 0; /* Increase top/bottom, remove from sides */
+    margin-bottom: 60px;
   }
 }
 
@@ -335,7 +336,7 @@ a:focus {
 
 /* Related posts */
 .related {
-  padding-top: 40px;
+  padding-top: 20px;
   padding-bottom: 40px;
   border-top: 1px solid #eee;
 }
@@ -359,18 +360,6 @@ a:focus {
 }
 
 
-/*
- * Error page
- *
- * For now, just the 404 (supported by Jekyll with the custom 404.html view).
- */
-
-.fourohfour {
-  margin-top: 40px;
-  margin-bottom: 40px;
-}
-
-
 /*
  * Pagination
  *
