Merge branch 'master' of github.com:justinwalsh/daux.io

This commit is contained in:
Justin Walsh 2013-07-19 07:41:22 -05:00
commit 85f08b5fe4
9 changed files with 428 additions and 12 deletions

View File

@ -118,8 +118,8 @@ By deafult your code blocks will be floated to a column on the right side of you
} }
###Github Repo: ###GitHub Repo:
Add a 'Fork me on Github' ribbon. Add a 'Fork me on GitHub' ribbon.
{ {
"repo": "justinwalsh/daux.io" "repo": "justinwalsh/daux.io"
@ -137,7 +137,7 @@ Include custom links in the sidebar.
{ {
"links": { "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", "Help/Support/Bugs": "https://github.com/justinwalsh/daux.io/issues",
"Made by Todaymade": "http://todaymade.com" "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 ## 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>.

View File

@ -6816,6 +6816,109 @@ pre code {
display: block; display: block;
clear: both; 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 ul li,
.float-view .content-page ol li { .float-view .content-page ol li {
margin-left: 30px; margin-left: 30px;

View File

@ -6816,6 +6816,109 @@ pre code {
display: block; display: block;
clear: both; 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 ul li,
.float-view .content-page ol li { .float-view .content-page ol li {
margin-left: 30px; margin-left: 30px;

View File

@ -6816,6 +6816,109 @@ pre code {
display: block; display: block;
clear: both; 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 ul li,
.float-view .content-page ol li { .float-view .content-page ol li {
margin-left: 30px; margin-left: 30px;

View File

@ -6816,6 +6816,109 @@ pre code {
display: block; display: block;
clear: both; 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 ul li,
.float-view .content-page ol li { .float-view .content-page ol li {
margin-left: 30px; margin-left: 30px;

View File

@ -118,8 +118,8 @@ By deafult your code blocks will be floated to a column on the right side of you
} }
###Github Repo: ###GitHub Repo:
Add a 'Fork me on Github' ribbon. Add a 'Fork me on GitHub' ribbon.
{ {
"repo": "justinwalsh/daux.io" "repo": "justinwalsh/daux.io"
@ -137,7 +137,7 @@ Include custom links in the sidebar.
{ {
"links": { "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", "Help/Support/Bugs": "https://github.com/justinwalsh/daux.io/issues",
"Made by Todaymade": "http://todaymade.com" "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 ## 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>.

View File

@ -8,8 +8,8 @@
"google_analytics": "UA-12653604-10", "google_analytics": "UA-12653604-10",
"links": { "links": {
"Download": "https://github.com/justinwalsh/daux.io/archive/master.zip", "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", "Help/Support/Bugs": "https://github.com/justinwalsh/daux.io/issues",
"Made by Todaymade": "http://todaymade.com" "Made by Todaymade": "http://todaymade.com"
} }
} }

View File

@ -24,7 +24,7 @@ Feedback & Suggestions
---- ----
To give us feedback or to suggest an idea, please create an request on the the 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 https://github.com/justinwalsh/daux.io/issues

View File

@ -237,7 +237,7 @@ html, body {
&.span9 { &.span9 {
width: 76.4866339334%; width: 76.4866339334%;
margin-left: 0px; margin-left: 0px;
@media (min-width: 1200px) { @media (min-width: 1200px) {
width: 76.8866339334%; width: 76.8866339334%;
} }
} }
@ -553,6 +553,10 @@ pre {
clear: both; clear: both;
//border-top: 1px solid @dark; //border-top: 1px solid @dark;
} }
p, ul, ol, dl, h2, h3,h4, h5, h6, pre {
float: none;
display: block;
}
} }
ul,ol { ul,ol {
li { li {