From 39d70626390cf5e7b8a06ac5545de5d5a80b3694 Mon Sep 17 00:00:00 2001
From: Garrett Moon <garrett@todaymade.com>
Date: Mon, 15 Jul 2013 16:14:08 -0500
Subject: [PATCH 1/2] Fixed a code floating issue with <pre> tags nested inside
 of list elements.

---
 css/daux-blue.css          | 103 +++++++++++++++++++++++++++++++++++++
 css/daux-green.css         | 103 +++++++++++++++++++++++++++++++++++++
 css/daux-navy.css          | 103 +++++++++++++++++++++++++++++++++++++
 css/daux-red.css           | 103 +++++++++++++++++++++++++++++++++++++
 less/import/daux-base.less |   6 ++-
 5 files changed, 417 insertions(+), 1 deletion(-)

diff --git a/css/daux-blue.css b/css/daux-blue.css
index 4de5857..9d3fadd 100644
--- a/css/daux-blue.css
+++ b/css/daux-blue.css
@@ -6816,6 +6816,109 @@ pre code {
     display: block;
     clear: both;
   }
+  .float-view .content-page .page-header p,
+  .float-view .content-page p p,
+  .float-view .content-page ul p,
+  .float-view .content-page ol p,
+  .float-view .content-page dl p,
+  .float-view .content-page h2 p,
+  .float-view .content-page h3 p,
+  .float-view .content-page h4 p,
+  .float-view .content-page h5 p,
+  .float-view .content-page h6 p,
+  .float-view .content-page .page-header ul,
+  .float-view .content-page p ul,
+  .float-view .content-page ul ul,
+  .float-view .content-page ol ul,
+  .float-view .content-page dl ul,
+  .float-view .content-page h2 ul,
+  .float-view .content-page h3 ul,
+  .float-view .content-page h4 ul,
+  .float-view .content-page h5 ul,
+  .float-view .content-page h6 ul,
+  .float-view .content-page .page-header ol,
+  .float-view .content-page p ol,
+  .float-view .content-page ul ol,
+  .float-view .content-page ol ol,
+  .float-view .content-page dl ol,
+  .float-view .content-page h2 ol,
+  .float-view .content-page h3 ol,
+  .float-view .content-page h4 ol,
+  .float-view .content-page h5 ol,
+  .float-view .content-page h6 ol,
+  .float-view .content-page .page-header dl,
+  .float-view .content-page p dl,
+  .float-view .content-page ul dl,
+  .float-view .content-page ol dl,
+  .float-view .content-page dl dl,
+  .float-view .content-page h2 dl,
+  .float-view .content-page h3 dl,
+  .float-view .content-page h4 dl,
+  .float-view .content-page h5 dl,
+  .float-view .content-page h6 dl,
+  .float-view .content-page .page-header h2,
+  .float-view .content-page p h2,
+  .float-view .content-page ul h2,
+  .float-view .content-page ol h2,
+  .float-view .content-page dl h2,
+  .float-view .content-page h2 h2,
+  .float-view .content-page h3 h2,
+  .float-view .content-page h4 h2,
+  .float-view .content-page h5 h2,
+  .float-view .content-page h6 h2,
+  .float-view .content-page .page-header h3,
+  .float-view .content-page p h3,
+  .float-view .content-page ul h3,
+  .float-view .content-page ol h3,
+  .float-view .content-page dl h3,
+  .float-view .content-page h2 h3,
+  .float-view .content-page h3 h3,
+  .float-view .content-page h4 h3,
+  .float-view .content-page h5 h3,
+  .float-view .content-page h6 h3,
+  .float-view .content-page .page-header h4,
+  .float-view .content-page p h4,
+  .float-view .content-page ul h4,
+  .float-view .content-page ol h4,
+  .float-view .content-page dl h4,
+  .float-view .content-page h2 h4,
+  .float-view .content-page h3 h4,
+  .float-view .content-page h4 h4,
+  .float-view .content-page h5 h4,
+  .float-view .content-page h6 h4,
+  .float-view .content-page .page-header h5,
+  .float-view .content-page p h5,
+  .float-view .content-page ul h5,
+  .float-view .content-page ol h5,
+  .float-view .content-page dl h5,
+  .float-view .content-page h2 h5,
+  .float-view .content-page h3 h5,
+  .float-view .content-page h4 h5,
+  .float-view .content-page h5 h5,
+  .float-view .content-page h6 h5,
+  .float-view .content-page .page-header h6,
+  .float-view .content-page p h6,
+  .float-view .content-page ul h6,
+  .float-view .content-page ol h6,
+  .float-view .content-page dl h6,
+  .float-view .content-page h2 h6,
+  .float-view .content-page h3 h6,
+  .float-view .content-page h4 h6,
+  .float-view .content-page h5 h6,
+  .float-view .content-page h6 h6,
+  .float-view .content-page .page-header pre,
+  .float-view .content-page p pre,
+  .float-view .content-page ul pre,
+  .float-view .content-page ol pre,
+  .float-view .content-page dl pre,
+  .float-view .content-page h2 pre,
+  .float-view .content-page h3 pre,
+  .float-view .content-page h4 pre,
+  .float-view .content-page h5 pre,
+  .float-view .content-page h6 pre {
+    float: none;
+    display: block;
+  }
   .float-view .content-page ul li,
   .float-view .content-page ol li {
     margin-left: 30px;
diff --git a/css/daux-green.css b/css/daux-green.css
index 8c9ea8f..5b557a2 100644
--- a/css/daux-green.css
+++ b/css/daux-green.css
@@ -6816,6 +6816,109 @@ pre code {
     display: block;
     clear: both;
   }
+  .float-view .content-page .page-header p,
+  .float-view .content-page p p,
+  .float-view .content-page ul p,
+  .float-view .content-page ol p,
+  .float-view .content-page dl p,
+  .float-view .content-page h2 p,
+  .float-view .content-page h3 p,
+  .float-view .content-page h4 p,
+  .float-view .content-page h5 p,
+  .float-view .content-page h6 p,
+  .float-view .content-page .page-header ul,
+  .float-view .content-page p ul,
+  .float-view .content-page ul ul,
+  .float-view .content-page ol ul,
+  .float-view .content-page dl ul,
+  .float-view .content-page h2 ul,
+  .float-view .content-page h3 ul,
+  .float-view .content-page h4 ul,
+  .float-view .content-page h5 ul,
+  .float-view .content-page h6 ul,
+  .float-view .content-page .page-header ol,
+  .float-view .content-page p ol,
+  .float-view .content-page ul ol,
+  .float-view .content-page ol ol,
+  .float-view .content-page dl ol,
+  .float-view .content-page h2 ol,
+  .float-view .content-page h3 ol,
+  .float-view .content-page h4 ol,
+  .float-view .content-page h5 ol,
+  .float-view .content-page h6 ol,
+  .float-view .content-page .page-header dl,
+  .float-view .content-page p dl,
+  .float-view .content-page ul dl,
+  .float-view .content-page ol dl,
+  .float-view .content-page dl dl,
+  .float-view .content-page h2 dl,
+  .float-view .content-page h3 dl,
+  .float-view .content-page h4 dl,
+  .float-view .content-page h5 dl,
+  .float-view .content-page h6 dl,
+  .float-view .content-page .page-header h2,
+  .float-view .content-page p h2,
+  .float-view .content-page ul h2,
+  .float-view .content-page ol h2,
+  .float-view .content-page dl h2,
+  .float-view .content-page h2 h2,
+  .float-view .content-page h3 h2,
+  .float-view .content-page h4 h2,
+  .float-view .content-page h5 h2,
+  .float-view .content-page h6 h2,
+  .float-view .content-page .page-header h3,
+  .float-view .content-page p h3,
+  .float-view .content-page ul h3,
+  .float-view .content-page ol h3,
+  .float-view .content-page dl h3,
+  .float-view .content-page h2 h3,
+  .float-view .content-page h3 h3,
+  .float-view .content-page h4 h3,
+  .float-view .content-page h5 h3,
+  .float-view .content-page h6 h3,
+  .float-view .content-page .page-header h4,
+  .float-view .content-page p h4,
+  .float-view .content-page ul h4,
+  .float-view .content-page ol h4,
+  .float-view .content-page dl h4,
+  .float-view .content-page h2 h4,
+  .float-view .content-page h3 h4,
+  .float-view .content-page h4 h4,
+  .float-view .content-page h5 h4,
+  .float-view .content-page h6 h4,
+  .float-view .content-page .page-header h5,
+  .float-view .content-page p h5,
+  .float-view .content-page ul h5,
+  .float-view .content-page ol h5,
+  .float-view .content-page dl h5,
+  .float-view .content-page h2 h5,
+  .float-view .content-page h3 h5,
+  .float-view .content-page h4 h5,
+  .float-view .content-page h5 h5,
+  .float-view .content-page h6 h5,
+  .float-view .content-page .page-header h6,
+  .float-view .content-page p h6,
+  .float-view .content-page ul h6,
+  .float-view .content-page ol h6,
+  .float-view .content-page dl h6,
+  .float-view .content-page h2 h6,
+  .float-view .content-page h3 h6,
+  .float-view .content-page h4 h6,
+  .float-view .content-page h5 h6,
+  .float-view .content-page h6 h6,
+  .float-view .content-page .page-header pre,
+  .float-view .content-page p pre,
+  .float-view .content-page ul pre,
+  .float-view .content-page ol pre,
+  .float-view .content-page dl pre,
+  .float-view .content-page h2 pre,
+  .float-view .content-page h3 pre,
+  .float-view .content-page h4 pre,
+  .float-view .content-page h5 pre,
+  .float-view .content-page h6 pre {
+    float: none;
+    display: block;
+  }
   .float-view .content-page ul li,
   .float-view .content-page ol li {
     margin-left: 30px;
diff --git a/css/daux-navy.css b/css/daux-navy.css
index 5762929..90a7466 100644
--- a/css/daux-navy.css
+++ b/css/daux-navy.css
@@ -6816,6 +6816,109 @@ pre code {
     display: block;
     clear: both;
   }
+  .float-view .content-page .page-header p,
+  .float-view .content-page p p,
+  .float-view .content-page ul p,
+  .float-view .content-page ol p,
+  .float-view .content-page dl p,
+  .float-view .content-page h2 p,
+  .float-view .content-page h3 p,
+  .float-view .content-page h4 p,
+  .float-view .content-page h5 p,
+  .float-view .content-page h6 p,
+  .float-view .content-page .page-header ul,
+  .float-view .content-page p ul,
+  .float-view .content-page ul ul,
+  .float-view .content-page ol ul,
+  .float-view .content-page dl ul,
+  .float-view .content-page h2 ul,
+  .float-view .content-page h3 ul,
+  .float-view .content-page h4 ul,
+  .float-view .content-page h5 ul,
+  .float-view .content-page h6 ul,
+  .float-view .content-page .page-header ol,
+  .float-view .content-page p ol,
+  .float-view .content-page ul ol,
+  .float-view .content-page ol ol,
+  .float-view .content-page dl ol,
+  .float-view .content-page h2 ol,
+  .float-view .content-page h3 ol,
+  .float-view .content-page h4 ol,
+  .float-view .content-page h5 ol,
+  .float-view .content-page h6 ol,
+  .float-view .content-page .page-header dl,
+  .float-view .content-page p dl,
+  .float-view .content-page ul dl,
+  .float-view .content-page ol dl,
+  .float-view .content-page dl dl,
+  .float-view .content-page h2 dl,
+  .float-view .content-page h3 dl,
+  .float-view .content-page h4 dl,
+  .float-view .content-page h5 dl,
+  .float-view .content-page h6 dl,
+  .float-view .content-page .page-header h2,
+  .float-view .content-page p h2,
+  .float-view .content-page ul h2,
+  .float-view .content-page ol h2,
+  .float-view .content-page dl h2,
+  .float-view .content-page h2 h2,
+  .float-view .content-page h3 h2,
+  .float-view .content-page h4 h2,
+  .float-view .content-page h5 h2,
+  .float-view .content-page h6 h2,
+  .float-view .content-page .page-header h3,
+  .float-view .content-page p h3,
+  .float-view .content-page ul h3,
+  .float-view .content-page ol h3,
+  .float-view .content-page dl h3,
+  .float-view .content-page h2 h3,
+  .float-view .content-page h3 h3,
+  .float-view .content-page h4 h3,
+  .float-view .content-page h5 h3,
+  .float-view .content-page h6 h3,
+  .float-view .content-page .page-header h4,
+  .float-view .content-page p h4,
+  .float-view .content-page ul h4,
+  .float-view .content-page ol h4,
+  .float-view .content-page dl h4,
+  .float-view .content-page h2 h4,
+  .float-view .content-page h3 h4,
+  .float-view .content-page h4 h4,
+  .float-view .content-page h5 h4,
+  .float-view .content-page h6 h4,
+  .float-view .content-page .page-header h5,
+  .float-view .content-page p h5,
+  .float-view .content-page ul h5,
+  .float-view .content-page ol h5,
+  .float-view .content-page dl h5,
+  .float-view .content-page h2 h5,
+  .float-view .content-page h3 h5,
+  .float-view .content-page h4 h5,
+  .float-view .content-page h5 h5,
+  .float-view .content-page h6 h5,
+  .float-view .content-page .page-header h6,
+  .float-view .content-page p h6,
+  .float-view .content-page ul h6,
+  .float-view .content-page ol h6,
+  .float-view .content-page dl h6,
+  .float-view .content-page h2 h6,
+  .float-view .content-page h3 h6,
+  .float-view .content-page h4 h6,
+  .float-view .content-page h5 h6,
+  .float-view .content-page h6 h6,
+  .float-view .content-page .page-header pre,
+  .float-view .content-page p pre,
+  .float-view .content-page ul pre,
+  .float-view .content-page ol pre,
+  .float-view .content-page dl pre,
+  .float-view .content-page h2 pre,
+  .float-view .content-page h3 pre,
+  .float-view .content-page h4 pre,
+  .float-view .content-page h5 pre,
+  .float-view .content-page h6 pre {
+    float: none;
+    display: block;
+  }
   .float-view .content-page ul li,
   .float-view .content-page ol li {
     margin-left: 30px;
diff --git a/css/daux-red.css b/css/daux-red.css
index 8fa1af8..9187ad0 100644
--- a/css/daux-red.css
+++ b/css/daux-red.css
@@ -6816,6 +6816,109 @@ pre code {
     display: block;
     clear: both;
   }
+  .float-view .content-page .page-header p,
+  .float-view .content-page p p,
+  .float-view .content-page ul p,
+  .float-view .content-page ol p,
+  .float-view .content-page dl p,
+  .float-view .content-page h2 p,
+  .float-view .content-page h3 p,
+  .float-view .content-page h4 p,
+  .float-view .content-page h5 p,
+  .float-view .content-page h6 p,
+  .float-view .content-page .page-header ul,
+  .float-view .content-page p ul,
+  .float-view .content-page ul ul,
+  .float-view .content-page ol ul,
+  .float-view .content-page dl ul,
+  .float-view .content-page h2 ul,
+  .float-view .content-page h3 ul,
+  .float-view .content-page h4 ul,
+  .float-view .content-page h5 ul,
+  .float-view .content-page h6 ul,
+  .float-view .content-page .page-header ol,
+  .float-view .content-page p ol,
+  .float-view .content-page ul ol,
+  .float-view .content-page ol ol,
+  .float-view .content-page dl ol,
+  .float-view .content-page h2 ol,
+  .float-view .content-page h3 ol,
+  .float-view .content-page h4 ol,
+  .float-view .content-page h5 ol,
+  .float-view .content-page h6 ol,
+  .float-view .content-page .page-header dl,
+  .float-view .content-page p dl,
+  .float-view .content-page ul dl,
+  .float-view .content-page ol dl,
+  .float-view .content-page dl dl,
+  .float-view .content-page h2 dl,
+  .float-view .content-page h3 dl,
+  .float-view .content-page h4 dl,
+  .float-view .content-page h5 dl,
+  .float-view .content-page h6 dl,
+  .float-view .content-page .page-header h2,
+  .float-view .content-page p h2,
+  .float-view .content-page ul h2,
+  .float-view .content-page ol h2,
+  .float-view .content-page dl h2,
+  .float-view .content-page h2 h2,
+  .float-view .content-page h3 h2,
+  .float-view .content-page h4 h2,
+  .float-view .content-page h5 h2,
+  .float-view .content-page h6 h2,
+  .float-view .content-page .page-header h3,
+  .float-view .content-page p h3,
+  .float-view .content-page ul h3,
+  .float-view .content-page ol h3,
+  .float-view .content-page dl h3,
+  .float-view .content-page h2 h3,
+  .float-view .content-page h3 h3,
+  .float-view .content-page h4 h3,
+  .float-view .content-page h5 h3,
+  .float-view .content-page h6 h3,
+  .float-view .content-page .page-header h4,
+  .float-view .content-page p h4,
+  .float-view .content-page ul h4,
+  .float-view .content-page ol h4,
+  .float-view .content-page dl h4,
+  .float-view .content-page h2 h4,
+  .float-view .content-page h3 h4,
+  .float-view .content-page h4 h4,
+  .float-view .content-page h5 h4,
+  .float-view .content-page h6 h4,
+  .float-view .content-page .page-header h5,
+  .float-view .content-page p h5,
+  .float-view .content-page ul h5,
+  .float-view .content-page ol h5,
+  .float-view .content-page dl h5,
+  .float-view .content-page h2 h5,
+  .float-view .content-page h3 h5,
+  .float-view .content-page h4 h5,
+  .float-view .content-page h5 h5,
+  .float-view .content-page h6 h5,
+  .float-view .content-page .page-header h6,
+  .float-view .content-page p h6,
+  .float-view .content-page ul h6,
+  .float-view .content-page ol h6,
+  .float-view .content-page dl h6,
+  .float-view .content-page h2 h6,
+  .float-view .content-page h3 h6,
+  .float-view .content-page h4 h6,
+  .float-view .content-page h5 h6,
+  .float-view .content-page h6 h6,
+  .float-view .content-page .page-header pre,
+  .float-view .content-page p pre,
+  .float-view .content-page ul pre,
+  .float-view .content-page ol pre,
+  .float-view .content-page dl pre,
+  .float-view .content-page h2 pre,
+  .float-view .content-page h3 pre,
+  .float-view .content-page h4 pre,
+  .float-view .content-page h5 pre,
+  .float-view .content-page h6 pre {
+    float: none;
+    display: block;
+  }
   .float-view .content-page ul li,
   .float-view .content-page ol li {
     margin-left: 30px;
diff --git a/less/import/daux-base.less b/less/import/daux-base.less
index 731b1b0..6d2faa6 100644
--- a/less/import/daux-base.less
+++ b/less/import/daux-base.less
@@ -237,7 +237,7 @@ html, body {
 		&.span9 {
 			width: 76.4866339334%;
 			margin-left: 0px;
-			@media (min-width: 1200px) { 
+			@media (min-width: 1200px) {
 				width: 76.8866339334%;
 			}
 		}
@@ -553,6 +553,10 @@ pre {
 					clear: both;
 					//border-top: 1px solid @dark;
 				}
+				p, ul, ol, dl, h2, h3,h4, h5, h6, pre {
+					float: none;
+					display: block;
+				}
 			}
 			ul,ol {
 				li {

From a4c0e49b8dd7d002ae6aa257a2dc91a107bbd16f Mon Sep 17 00:00:00 2001
From: Wynn Netherland <wynn@github.com>
Date: Wed, 17 Jul 2013 11:54:08 -0500
Subject: [PATCH 2/2] s/Github/GitHub

---
 README.md                  | 8 ++++----
 docs/00_Getting_Started.md | 8 ++++----
 docs/config.json           | 4 ++--
 index.php                  | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index d26dda1..ca5a752 100644
--- a/README.md
+++ b/README.md
@@ -118,8 +118,8 @@ By deafult your code blocks will be floated to a column on the right side of you
 	}
 
 
-###Github Repo:
-Add a 'Fork me on Github' ribbon.
+###GitHub Repo:
+Add a 'Fork me on GitHub' ribbon.
 
 	{
 		"repo": "justinwalsh/daux.io"
@@ -137,7 +137,7 @@ Include custom links in the sidebar.
 
 	{
 		"links": {
-			"Github Repo": "https://github.com/justinwalsh/daux.io",
+			"GitHub Repo": "https://github.com/justinwalsh/daux.io",
 			"Help/Support/Bugs": "https://github.com/justinwalsh/daux.io/issues",
 			"Made by Todaymade": "http://todaymade.com"
 		}
@@ -165,4 +165,4 @@ This project contains a package.json file, so once you have the requirements ins
 
 ## Support
 
-If you need help using Daux.io, or have found a bug, please create an issue on the <a href="https://github.com/justinwalsh/daux.io/issues" target="_blank">Github repo</a>.
+If you need help using Daux.io, or have found a bug, please create an issue on the <a href="https://github.com/justinwalsh/daux.io/issues" target="_blank">GitHub repo</a>.
diff --git a/docs/00_Getting_Started.md b/docs/00_Getting_Started.md
index d26dda1..ca5a752 100644
--- a/docs/00_Getting_Started.md
+++ b/docs/00_Getting_Started.md
@@ -118,8 +118,8 @@ By deafult your code blocks will be floated to a column on the right side of you
 	}
 
 
-###Github Repo:
-Add a 'Fork me on Github' ribbon.
+###GitHub Repo:
+Add a 'Fork me on GitHub' ribbon.
 
 	{
 		"repo": "justinwalsh/daux.io"
@@ -137,7 +137,7 @@ Include custom links in the sidebar.
 
 	{
 		"links": {
-			"Github Repo": "https://github.com/justinwalsh/daux.io",
+			"GitHub Repo": "https://github.com/justinwalsh/daux.io",
 			"Help/Support/Bugs": "https://github.com/justinwalsh/daux.io/issues",
 			"Made by Todaymade": "http://todaymade.com"
 		}
@@ -165,4 +165,4 @@ This project contains a package.json file, so once you have the requirements ins
 
 ## Support
 
-If you need help using Daux.io, or have found a bug, please create an issue on the <a href="https://github.com/justinwalsh/daux.io/issues" target="_blank">Github repo</a>.
+If you need help using Daux.io, or have found a bug, please create an issue on the <a href="https://github.com/justinwalsh/daux.io/issues" target="_blank">GitHub repo</a>.
diff --git a/docs/config.json b/docs/config.json
index 6058abe..13dd813 100644
--- a/docs/config.json
+++ b/docs/config.json
@@ -8,8 +8,8 @@
 	"google_analytics": "UA-12653604-10",
 	"links": {
 		"Download": "https://github.com/justinwalsh/daux.io/archive/master.zip",
-		"Github Repo": "https://github.com/justinwalsh/daux.io",
+		"GitHub Repo": "https://github.com/justinwalsh/daux.io",
 		"Help/Support/Bugs": "https://github.com/justinwalsh/daux.io/issues",
 		"Made by Todaymade": "http://todaymade.com"
 	}
-}
\ No newline at end of file
+}
diff --git a/index.php b/index.php
index 658a377..ee9354e 100644
--- a/index.php
+++ b/index.php
@@ -24,7 +24,7 @@ Feedback & Suggestions
 ----
 
 To give us feedback or to suggest an idea, please create an request on the the
-Github issue tracker:
+GitHub issue tracker:
 
 https://github.com/justinwalsh/daux.io/issues