Merge pull request #103 from tripit/dev

Slate 1.1

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 1.1
+
+*July 27th, 2014*
+
+**Fixes:**
+
+- Finally, a fix for the redcarpet upgrade bug
+
 ## Version 1.0
 
 *July 2, 2014*

Gemfile.lock

@@ -96,7 +96,7 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
-    redcarpet (3.1.1)
+    redcarpet (3.1.2)
     ref (1.0.5)
     rouge (1.3.3)
     ruby18_source_location (0.2)

README.md

@@ -62,6 +62,7 @@ Examples of Slate in the Wild
 * [Drcaban's Build a Quine tutorial](http://drcabana.github.io/build-a-quine/#introduction)
 * [PricePlow API docs](https://www.priceplow.com/api/documentation)
 * [Emerging Threats API docs](http://apidocs.emergingthreats.net/)
+* [Appium docs](http://appium.io/slate/en/master)
 
 (Feel free to add your site to this list in a pull request!)
 

lib/redcarpet_header_fix.rb

@@ -1,7 +1,7 @@
 module RedcarpetHeaderFix
-  def header(text, level, id)
-    clean_id = id.gsub(/[\.]/, '-').gsub(/[^a-zA-Z0-9\-_]/, '')
-    "<h#{level} id='#{clean_id}'>#{text}</h1>"
+  def header(text, level)
+    clean_id = text.downcase.gsub(/( +|\.+)/, '-').gsub(/[^a-zA-Z0-9\-_]/, '')
+    "<h#{level} id='#{clean_id}'>#{text}</h#{level}>"
   end
 end
 

source/stylesheets/variables.scss

@@ -78,8 +78,9 @@ $phone-width: $tablet-width - $nav-width; // min width before reverting to mobil
 }
 
 %code-font {
-  font-family: Monaco, "Courier New", monospace;
+  font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, serif;
   font-size: 12px;
+  line-height: 1.5;
 }