From a884a8a8802a0a9020ba364a98ddf60c81c6ef61 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Mar 2014 08:10:57 +0200 Subject: [PATCH 001/160] Move vendor prefixed properties before the unprefixed ones. --- site/_includes/css/style.css | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index dee485a70..777cb8723 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -1,9 +1,9 @@ /* Base */ * { - box-sizing: border-box; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + box-sizing: border-box; } body { @@ -71,9 +71,9 @@ nav li { padding: 0.5em 1em; text-shadow: none; text-transform: uppercase; - transition: all .25s; - -moz-transition: all .25s; -webkit-transition: all .25s; + -moz-transition: all .25s; + transition: all .25s; } .main-nav li a:hover { @@ -256,12 +256,12 @@ body > footer a:hover img { text-shadow: 0 1px 0 rgba(255,255,255,.5); background: #f7f7f7; background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y3ZjdmNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjclIiBzdG9wLWNvbG9yPSIjY2ZjZmNmIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2FhYWFhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=); - background: -moz-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7f7f7), color-stop(7%,#cfcfcf), color-stop(100%,#aaaaaa)); - background: -webkit-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); - background: -o-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); - background: -ms-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); - background: linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background: -webkit-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background: -moz-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%); + background: -ms-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background: -o-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background: linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#aaaaaa',GradientType=0 ); border-bottom: 1px solid #111; } @@ -548,12 +548,12 @@ article h2:first-child { box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); background: #9e2812; background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); - background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); + background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); + background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); } @@ -664,9 +664,9 @@ h1, h2, h3, h4, h5, h6 { a { color: #fc0; text-decoration: none; - transition: all .25s; - -moz-transition: all .25s; -webkit-transition: all .25s; + -moz-transition: all .25s; + transition: all .25s; } a:hover { @@ -744,12 +744,12 @@ thead { color: #fff; background: #3a3a3a; background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzNhM2EzYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxZTFlMWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3a3a3a), color-stop(100%,#1e1e1e)); - background: -webkit-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); - background: -o-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); - background: -ms-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); - background: linear-gradient(to bottom, #3a3a3a 0%,#1e1e1e 100%); + background: -webkit-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); + background: -moz-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%); + background: -ms-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); + background: -o-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); + background: linear-gradient(to bottom, #3a3a3a 0%,#1e1e1e 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3a3a3a', endColorstr='#1e1e1e',GradientType=0 ); } @@ -786,12 +786,12 @@ tbody td { border-top: 1px solid rgba(0,0,0,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1); background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=); - background: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); - background: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); - background: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); - background: -ms-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); - background: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); + background: -ms-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1affffff', endColorstr='#00ffffff',GradientType=0 ); } @@ -827,12 +827,12 @@ code.option, code.flag, code.filter, code.output { box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); background: #7e6d42; background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzdlNmQ0MiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1YzRlMzUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #7e6d42 0%, #5c4e35 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7e6d42), color-stop(100%,#5c4e35)); - background: -webkit-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); - background: -o-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); - background: -ms-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); - background: linear-gradient(to bottom, #7e6d42 0%,#5c4e35 100%); + background: -webkit-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); + background: -moz-linear-gradient(top, #7e6d42 0%, #5c4e35 100%); + background: -ms-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); + background: -o-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); + background: linear-gradient(to bottom, #7e6d42 0%,#5c4e35 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7e6d42', endColorstr='#5c4e35',GradientType=0 ); } @@ -879,24 +879,24 @@ code.option, code.flag, code.filter, code.output { .info { background: #0389aa; background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAzODlhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDYxN2YiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #0389aa 0%, #00617f 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0389aa), color-stop(100%,#00617f)); - background: -webkit-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: -o-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: -ms-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: linear-gradient(to bottom, #0389aa 0%,#00617f 100%); + background: -webkit-linear-gradient(top, #0389aa 0%,#00617f 100%); + background: -moz-linear-gradient(top, #0389aa 0%, #00617f 100%); + background: -ms-linear-gradient(top, #0389aa 0%,#00617f 100%); + background: -o-linear-gradient(top, #0389aa 0%,#00617f 100%); + background: linear-gradient(to bottom, #0389aa 0%,#00617f 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0389aa', endColorstr='#00617f',GradientType=0 ); } .warning { background: #9e2812; background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); - background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); + background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); + background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); } @@ -904,12 +904,12 @@ code.option, code.flag, code.filter, code.output { background: rgb(205,146,57); /* Old browsers */ /* IE9 SVG, needs conditional override of 'filter' to 'none' */ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2NkOTIzOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNhMjc1MjgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(205,146,57,1)), color-stop(100%,rgba(162,117,40,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* IE10+ */ - background: linear-gradient(to bottom, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* W3C */ + background: -webkit-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Chrome10+,Safari5.1+ */ + background: -moz-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); /* FF3.6+ */ + background: -ms-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* IE10+ */ + background: -o-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Opera 11.10+ */ + background: linear-gradient(to bottom, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cd9239', endColorstr='#a27528',GradientType=0 ); /* IE6-8 */ } From 5e85163b5752f9956f14ad51b33e9cda253f2d24 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Mar 2014 08:14:00 +0200 Subject: [PATCH 002/160] Use the shorthand font property when possible. Conflicts: site/_includes/css/style.css --- site/_includes/css/style.css | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index 777cb8723..c1e71b871 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -7,9 +7,7 @@ } body { - font-family: Lato, 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 21px; - font-weight: 300; + font: 300 21px Lato, 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #ddd; background: #333; border-top: 5px solid #fc0; @@ -249,9 +247,7 @@ body > footer a:hover img { padding: 5px 0; border-radius: 5px 5px 0 0; box-shadow: 0 3px 10px rgba(0,0,0,.5); - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 16px; - font-weight: 400; + font: 400 16px/24px 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #444; text-shadow: 0 1px 0 rgba(255,255,255,.5); background: #f7f7f7; @@ -621,10 +617,8 @@ pre, code { display: inline-block; margin: 0; padding: 0; - font-family: Menlo, Consolas, "Courier New", Courier, "Liberation Mono", monospace; - font-size: 14px; + font: 14px/1.8em Menlo, Consolas, "Courier New", Courier, "Liberation Mono", monospace; padding: 0 .5em; - line-height: 1.8em; } @media (min-width: 768px){ From 7fdcc1af18caee0ecf13acc93bd9c82629b56434 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Mar 2014 08:18:27 +0200 Subject: [PATCH 003/160] Be explicit with the `background` property. --- site/_includes/css/style.css | 152 +++++++++++++++++------------------ 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index c1e71b871..8af83fe60 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -9,7 +9,7 @@ body { font: 300 21px Lato, 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #ddd; - background: #333; + background-color: #333; border-top: 5px solid #fc0; box-shadow: inset 0 3px 30px rgba(0,0,0,.3); text-shadow: 0 1px 3px rgba(0,0,0,.5); @@ -75,13 +75,13 @@ nav li { } .main-nav li a:hover { - background: #252525; + background-color: #252525; box-shadow: inset 0 1px 3px rgba(0,0,0,.5), 0 1px 0 rgba(255,255,255,.1); text-shadow: 0 1px 3px rgba(0,0,0,.5); } .main-nav li.current a { - background: #fc0; + background-color: #fc0; color: #222; box-shadow: inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px rgba(0,0,0,.5); text-shadow: 0 1px 0 rgba(255,255,255,.3); @@ -96,7 +96,7 @@ nav li { .mobile-nav a { float: left; width: 100%; - background: #333; + background-color: #333; color: #fc0; text-align: center; text-transform: uppercase; @@ -107,7 +107,7 @@ nav li { } .mobile-nav .current a { - background: #fc0; + background-color: #fc0; color: #222; box-shadow: inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px rgba(0,0,0,.5); text-shadow: 0 1px 0 rgba(255,255,255,.3); @@ -136,7 +136,7 @@ nav li { /* Footer */ body > footer { - background: #222; + background-color: #222; font-size: 16px; padding-bottom: 5px; color: #888; @@ -196,7 +196,7 @@ body > footer a:hover img { /* Quickstart */ .quickstart { - background: #3F1F1F; + background-color: #3F1F1F; color: #fff; margin: 60px 0; box-shadow: inset 0 3px 10px rgba(0,0,0,.4); @@ -250,14 +250,14 @@ body > footer a:hover img { font: 400 16px/24px 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #444; text-shadow: 0 1px 0 rgba(255,255,255,.5); - background: #f7f7f7; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y3ZjdmNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjclIiBzdG9wLWNvbG9yPSIjY2ZjZmNmIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2FhYWFhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7f7f7), color-stop(7%,#cfcfcf), color-stop(100%,#aaaaaa)); - background: -webkit-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); - background: -moz-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%); - background: -ms-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); - background: -o-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); - background: linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background-color: #f7f7f7; + background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y3ZjdmNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjclIiBzdG9wLWNvbG9yPSIjY2ZjZmNmIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2FhYWFhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7f7f7), color-stop(7%,#cfcfcf), color-stop(100%,#aaaaaa)); + background-image: -webkit-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background-image: -moz-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%); + background-image: -ms-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background-image: -o-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background-image: linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#aaaaaa',GradientType=0 ); border-bottom: 1px solid #111; } @@ -266,7 +266,7 @@ body > footer a:hover img { padding: 20px; text-shadow: none; margin: 0 20px; - background: #3d3d3d; + background-color: #3d3d3d; border-radius: 0 0 5px 5px; box-shadow: 0 5px 30px rgba(0,0,0,.3); } @@ -310,7 +310,7 @@ body > footer a:hover img { /* Free Hosting */ .free-hosting .pane { - background: #444; + background-color: #444; border-radius: 10px; text-shadow: none; position: relative; @@ -367,7 +367,7 @@ body > footer a:hover img { article { - background: #444; + background-color: #444; border-radius: 10px; padding: 20px; margin: 0 10px; @@ -470,12 +470,12 @@ aside li.current a:before { border-radius: 5px; /*border: 1px solid #333;*/ box-shadow: 0 1px 3px rgba(0,0,0,.3), inset 0 1px 1px rgba(255,255,255,.5); - background: #777; + background-color: #777; } .section-nav a:hover { color: #fff; - background: #888; + background-color: #888; } .section-nav .next, .section-nav .prev { @@ -542,14 +542,14 @@ article h2:first-child { border-radius: 0 5px 5px 0; position: relative; box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); - background: #9e2812; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); - background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); - background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); + background-color: #9e2812; + background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); + background-image: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); + background-image: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); } @@ -628,7 +628,7 @@ pre, code { } .highlight, p > pre, p > code, p > nobr > code, li > code, h5 > code, .note > code { - background: #333; + background-color: #333; color: #fff; border-radius: 5px; box-shadow: inset 0 1px 10px rgba(0,0,0,.3), @@ -726,7 +726,7 @@ blockquote { table { width: 100%; - background: #555; + background-color: #555; margin: .5em 0; border-radius: 5px; box-shadow: 0 1px 3px rgba(0,0,0,.3); @@ -736,14 +736,14 @@ thead { border-top-left-radius: 5px; border-top-right-radius: 5px; color: #fff; - background: #3a3a3a; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzNhM2EzYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxZTFlMWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3a3a3a), color-stop(100%,#1e1e1e)); - background: -webkit-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); - background: -moz-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%); - background: -ms-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); - background: -o-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); - background: linear-gradient(to bottom, #3a3a3a 0%,#1e1e1e 100%); + background-color: #3a3a3a; + background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzNhM2EzYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxZTFlMWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3a3a3a), color-stop(100%,#1e1e1e)); + background-image: -webkit-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); + background-image: -moz-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%); + background-image: -ms-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); + background-image: -o-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); + background-image: linear-gradient(to bottom, #3a3a3a 0%,#1e1e1e 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3a3a3a', endColorstr='#1e1e1e',GradientType=0 ); } @@ -780,12 +780,12 @@ tbody td { border-top: 1px solid rgba(0,0,0,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1); background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); - background: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); - background: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); - background: -ms-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); - background: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); - background: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); + background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background-image: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); + background-image: -ms-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background-image: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background-image: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1affffff', endColorstr='#00ffffff',GradientType=0 ); } @@ -819,14 +819,14 @@ code.option, code.flag, code.filter, code.output { border-radius: 0 5px 5px 0; position: relative; box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); - background: #7e6d42; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzdlNmQ0MiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1YzRlMzUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7e6d42), color-stop(100%,#5c4e35)); - background: -webkit-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); - background: -moz-linear-gradient(top, #7e6d42 0%, #5c4e35 100%); - background: -ms-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); - background: -o-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); - background: linear-gradient(to bottom, #7e6d42 0%,#5c4e35 100%); + background-color: #7e6d42; + background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzdlNmQ0MiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1YzRlMzUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7e6d42), color-stop(100%,#5c4e35)); + background-image: -webkit-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); + background-image: -moz-linear-gradient(top, #7e6d42 0%, #5c4e35 100%); + background-image: -ms-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); + background-image: -o-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); + background-image: linear-gradient(to bottom, #7e6d42 0%,#5c4e35 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7e6d42', endColorstr='#5c4e35',GradientType=0 ); } @@ -871,39 +871,39 @@ code.option, code.flag, code.filter, code.output { } .info { - background: #0389aa; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAzODlhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDYxN2YiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0389aa), color-stop(100%,#00617f)); - background: -webkit-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: -moz-linear-gradient(top, #0389aa 0%, #00617f 100%); - background: -ms-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: -o-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: linear-gradient(to bottom, #0389aa 0%,#00617f 100%); + background-color: #0389aa; + background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAzODlhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDYxN2YiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0389aa), color-stop(100%,#00617f)); + background-image: -webkit-linear-gradient(top, #0389aa 0%,#00617f 100%); + background-image: -moz-linear-gradient(top, #0389aa 0%, #00617f 100%); + background-image: -ms-linear-gradient(top, #0389aa 0%,#00617f 100%); + background-image: -o-linear-gradient(top, #0389aa 0%,#00617f 100%); + background-image: linear-gradient(to bottom, #0389aa 0%,#00617f 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0389aa', endColorstr='#00617f',GradientType=0 ); } .warning { - background: #9e2812; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); - background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); - background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); + background-color: #9e2812; + background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); + background-image: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); + background-image: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); } .unreleased { - background: rgb(205,146,57); /* Old browsers */ + background-color: #cd9239; /* Old browsers */ /* IE9 SVG, needs conditional override of 'filter' to 'none' */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2NkOTIzOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNhMjc1MjgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(205,146,57,1)), color-stop(100%,rgba(162,117,40,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -moz-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); /* FF3.6+ */ - background: -ms-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* IE10+ */ - background: -o-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(to bottom, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* W3C */ + background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2NkOTIzOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNhMjc1MjgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(205,146,57,1)), color-stop(100%,rgba(162,117,40,1))); /* Chrome,Safari4+ */ + background-image: -webkit-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Chrome10+,Safari5.1+ */ + background-image: -moz-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); /* FF3.6+ */ + background-image: -ms-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* IE10+ */ + background-image: -o-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Opera 11.10+ */ + background-image: linear-gradient(to bottom, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cd9239', endColorstr='#a27528',GradientType=0 ); /* IE6-8 */ } From ecdeea22eb7ac210dbe2a834a0685d7f2d6b2f26 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Mar 2014 08:23:06 +0200 Subject: [PATCH 004/160] Remove units from zero. --- site/_includes/css/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index 8af83fe60..c0b4be068 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -203,7 +203,7 @@ body > footer a:hover img { } .quickstart .content { - padding: 0px 0; + padding: 0; } .quickstart h4 { @@ -576,7 +576,7 @@ article h2:first-child { content: ""; position: absolute; top: -10px; - left: 0px; + left: 0; border-color: transparent #6f0d0d #6f0d0d transparent; border-style: solid; border-width: 5px; @@ -846,7 +846,7 @@ code.option, code.flag, code.filter, code.output { content: ""; position: absolute; top: -10px; - left: 0px; + left: 0; border-color: transparent #222 #222 transparent; border-style: solid; border-width: 5px; From 0463399389edee01395dd65bd24838902e29c4a9 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Mar 2014 08:30:39 +0200 Subject: [PATCH 005/160] Remove duplicate properties. --- lib/site_template/css/main.css | 1 - site/_includes/css/style.css | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/site_template/css/main.css b/lib/site_template/css/main.css index e1f046f6a..7191b72e2 100644 --- a/lib/site_template/css/main.css +++ b/lib/site_template/css/main.css @@ -9,7 +9,6 @@ html, body { height: 100%; } body { - background-color: #FFF; font-family: Helvetica, Arial, sans-serif; font-size: 16px; line-height: 1.5; diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index c0b4be068..6713f3aa9 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -616,9 +616,8 @@ pre, code { white-space: pre; display: inline-block; margin: 0; - padding: 0; font: 14px/1.8em Menlo, Consolas, "Courier New", Courier, "Liberation Mono", monospace; - padding: 0 .5em; + padding: 0 0.5em; } @media (min-width: 768px){ From 63b45a993d063af97cb0bd390da7e8e61a4c04e1 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Mar 2014 08:31:05 +0200 Subject: [PATCH 006/160] Add fallback colors. --- site/_includes/css/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index 6713f3aa9..272e50037 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -636,6 +636,7 @@ pre, code { } .note code { + background-color: #333; background-color: rgba(0,0,0,0.2); margin-left: 2.5px; margin-right: 2.5px; @@ -776,6 +777,7 @@ th { } tbody td { + border-top: 1px solid #747474; border-top: 1px solid rgba(0,0,0,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1); background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=); From 10f85eb856fe46519e7acd04c23f69d14eea514f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Mar 2014 08:31:18 +0200 Subject: [PATCH 007/160] Add missing vendor prefixed properties. --- lib/site_template/css/main.css | 6 ++ site/_includes/css/style.css | 176 ++++++++++++++++++++++----------- 2 files changed, 126 insertions(+), 56 deletions(-) diff --git a/lib/site_template/css/main.css b/lib/site_template/css/main.css index 7191b72e2..93ab284a4 100644 --- a/lib/site_template/css/main.css +++ b/lib/site_template/css/main.css @@ -230,6 +230,8 @@ a:visited { color: #205caa; } border: 1px solid #d5d5e9; background-color: #eef; padding: 8px 12px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; font-size: 15px; } @@ -246,6 +248,8 @@ a:visited { color: #205caa; } border: 1px solid #000; background-color: #333; color: #FFF; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; } @@ -350,6 +354,8 @@ a:visited { color: #205caa; } z-index: 10; top: 14px; right: 8px; background-color: white; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; border: 1px solid #e8e8e8; } diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index 272e50037..c957168d9 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -11,6 +11,8 @@ body { color: #ddd; background-color: #333; border-top: 5px solid #fc0; + -webkit-box-shadow: inset 0 3px 30px rgba(0,0,0,.3); + -moz-box-shadow: inset 0 3px 30px rgba(0,0,0,.3); box-shadow: inset 0 3px 30px rgba(0,0,0,.3); text-shadow: 0 1px 3px rgba(0,0,0,.5); } @@ -63,19 +65,24 @@ nav li { } .main-nav li a { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; font-weight: 900; font-size: 14px; padding: 0.5em 1em; text-shadow: none; text-transform: uppercase; - -webkit-transition: all .25s; - -moz-transition: all .25s; + -webkit-transition: all .25s; + -moz-transition: all .25s; + -o-transition: all .25s; transition: all .25s; } .main-nav li a:hover { background-color: #252525; + -webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,.5), 0 1px 0 rgba(255,255,255,.1); + -moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.5), 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 3px rgba(0,0,0,.5), 0 1px 0 rgba(255,255,255,.1); text-shadow: 0 1px 3px rgba(0,0,0,.5); } @@ -83,6 +90,8 @@ nav li { .main-nav li.current a { background-color: #fc0; color: #222; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px rgba(0,0,0,.5); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px rgba(0,0,0,.5); box-shadow: inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px rgba(0,0,0,.5); text-shadow: 0 1px 0 rgba(255,255,255,.3); } @@ -103,12 +112,16 @@ nav li { font-size: 14px; font-weight: 900; padding: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; } .mobile-nav .current a { background-color: #fc0; color: #222; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px rgba(0,0,0,.5); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px rgba(0,0,0,.5); box-shadow: inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px rgba(0,0,0,.5); text-shadow: 0 1px 0 rgba(255,255,255,.3); } @@ -119,12 +132,12 @@ nav li { padding: 8px 2px; } -@media (max-width: 768px){ +@media (max-width: 768px) { .main-nav ul { text-align: right; } } -@media (max-width: 830px){ +@media (max-width: 830px) { .main-nav .show-on-mobiles { display: inline; } @@ -159,6 +172,7 @@ body > footer img { padding: 1px; -webkit-transition: opacity .2s; -moz-transition: opacity .2s; + -o-transition: opacity .2s; transition: opacity .2s; } @@ -166,7 +180,7 @@ body > footer a:hover img { opacity: 1; } -@media (max-width: 568px){ +@media (max-width: 568px) { footer .one-third p { margin-bottom: 0; } @@ -187,7 +201,7 @@ body > footer a:hover img { margin: 0; } -@media (min-width: 569px){ +@media (min-width: 569px) { .intro p { font-size: 3.2em; } @@ -199,6 +213,8 @@ body > footer a:hover img { background-color: #3F1F1F; color: #fff; margin: 60px 0; + -webkit-box-shadow: inset 0 3px 10px rgba(0,0,0,.4); + -moz-box-shadow: inset 0 3px 10px rgba(0,0,0,.4); box-shadow: inset 0 3px 10px rgba(0,0,0,.4); } @@ -219,7 +235,7 @@ body > footer a:hover img { margin: 0 0 -30px; } -@media (min-width: 768px){ +@media (min-width: 768px) { .quickstart .code { font-size: 18px; margin: -30px 0; @@ -245,18 +261,21 @@ body > footer a:hover img { text-align: center; margin: 0 20px; padding: 5px 0; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; + -webkit-box-shadow: 0 3px 10px rgba(0,0,0,.5); + -moz-box-shadow: 0 3px 10px rgba(0,0,0,.5); box-shadow: 0 3px 10px rgba(0,0,0,.5); font: 400 16px/24px 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #444; text-shadow: 0 1px 0 rgba(255,255,255,.5); background-color: #f7f7f7; background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y3ZjdmNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjclIiBzdG9wLWNvbG9yPSIjY2ZjZmNmIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2FhYWFhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7f7f7), color-stop(7%,#cfcfcf), color-stop(100%,#aaaaaa)); - background-image: -webkit-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), color-stop(7%, #cfcfcf), to(#aaaaaa)); + background-image: -webkit-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%); background-image: -moz-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%); - background-image: -ms-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); - background-image: -o-linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); + background-image: -o-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%); background-image: linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#aaaaaa',GradientType=0 ); border-bottom: 1px solid #111; @@ -267,7 +286,11 @@ body > footer a:hover img { text-shadow: none; margin: 0 20px; background-color: #3d3d3d; + -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; + -webkit-box-shadow: 0 5px 30px rgba(0,0,0,.3); + -moz-box-shadow: 0 5px 30px rgba(0,0,0,.3); box-shadow: 0 5px 30px rgba(0,0,0,.3); } @@ -311,6 +334,8 @@ body > footer a:hover img { .free-hosting .pane { background-color: #444; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; border-radius: 10px; text-shadow: none; position: relative; @@ -336,7 +361,7 @@ body > footer a:hover img { margin: .75em 0; } -@media (min-width: 768px){ +@media (min-width: 768px) { .free-hosting img { float: left; margin: -20px -30px -30px -50px; @@ -368,26 +393,30 @@ body > footer a:hover img { article { background-color: #444; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; border-radius: 10px; padding: 20px; margin: 0 10px; + -webkit-box-shadow: 0 3px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 3px 10px rgba(0,0,0,.1); box-shadow: 0 3px 10px rgba(0,0,0,.1); font-size: 16px; } -@media (max-width: 480px){ +@media (max-width: 480px) { article ul { padding-left: 20px; } } -@media (max-width: 568px){ +@media (max-width: 568px) { article { margin: 0; } } -@media (min-width: 768px){ +@media (min-width: 768px) { article { padding: 40px 40px 30px; font-size: 21px; @@ -467,8 +496,12 @@ aside li.current a:before { text-transform: uppercase; font-weight: 700; padding: 8px 12px 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; /*border: 1px solid #333;*/ + -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.3), inset 0 1px 1px rgba(255,255,255,.5); + -moz-box-shadow: 0 1px 3px rgba(0,0,0,.3), inset 0 1px 1px rgba(255,255,255,.5); box-shadow: 0 1px 3px rgba(0,0,0,.3), inset 0 1px 1px rgba(255,255,255,.5); background-color: #777; } @@ -539,16 +572,19 @@ article h2:first-child { margin-left: -30px; padding: 6px 10px 8px; padding-left: 50px; + -webkit-border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; border-radius: 0 5px 5px 0; position: relative; + -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); + -moz-box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); background-color: #9e2812; background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); - background-image: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(#9e2812), to(#6f0d0d)); + background-image: -webkit-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); background-image: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); - background-image: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background-image: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: -o-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); background-image: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); } @@ -560,13 +596,13 @@ article h2:first-child { text-shadow: 0 -1px 0 rgba(0,0,0,.5); } -@media (max-width: 568px){ +@media (max-width: 568px) { .post-category { padding-left: 30px; } } -@media (min-width: 768px){ +@media (min-width: 768px) { .post-category { margin-left: -50px; } @@ -585,6 +621,8 @@ article h2:first-child { } .avatar { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; display: inline-block; vertical-align: middle; @@ -604,8 +642,12 @@ article h2:first-child { .news article + article { margin-top: -10px; + -webkit-border-radius: 0 0 10px 10px; + -moz-border-radius: 0 0 10px 10px; border-radius: 0 0 10px 10px; border-top: 1px solid #555; + -webkit-box-shadow: 0 -1px 0 #2f2f2f; + -moz-box-shadow: 0 -1px 0 #2f2f2f; box-shadow: 0 -1px 0 #2f2f2f; } @@ -620,7 +662,7 @@ pre, code { padding: 0 0.5em; } -@media (min-width: 768px){ +@media (min-width: 768px) { pre, code { font-size: 16px; } @@ -629,7 +671,15 @@ pre, code { .highlight, p > pre, p > code, p > nobr > code, li > code, h5 > code, .note > code { background-color: #333; color: #fff; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; + -webkit-box-shadow: inset 0 1px 10px rgba(0,0,0,.3), + 0 1px 0 rgba(255,255,255,.1), + 0 -1px 0 rgba(0,0,0,.5); + -moz-box-shadow: inset 0 1px 10px rgba(0,0,0,.3), + 0 1px 0 rgba(255,255,255,.1), + 0 -1px 0 rgba(0,0,0,.5); box-shadow: inset 0 1px 10px rgba(0,0,0,.3), 0 1px 0 rgba(255,255,255,.1), 0 -1px 0 rgba(0,0,0,.5); @@ -658,8 +708,9 @@ h1, h2, h3, h4, h5, h6 { a { color: #fc0; text-decoration: none; - -webkit-transition: all .25s; - -moz-transition: all .25s; + -webkit-transition: all .25s; + -moz-transition: all .25s; + -o-transition: all .25s; transition: all .25s; } @@ -728,35 +779,48 @@ table { width: 100%; background-color: #555; margin: .5em 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; + -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.3); + -moz-box-shadow: 0 1px 3px rgba(0,0,0,.3); box-shadow: 0 1px 3px rgba(0,0,0,.3); } thead { + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; border-top-right-radius: 5px; color: #fff; background-color: #3a3a3a; background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzNhM2EzYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxZTFlMWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3a3a3a), color-stop(100%,#1e1e1e)); - background-image: -webkit-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(#3a3a3a), to(#1e1e1e)); + background-image: -webkit-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%); background-image: -moz-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%); - background-image: -ms-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); - background-image: -o-linear-gradient(top, #3a3a3a 0%,#1e1e1e 100%); + background-image: -o-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%); background-image: linear-gradient(to bottom, #3a3a3a 0%,#1e1e1e 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3a3a3a', endColorstr='#1e1e1e',GradientType=0 ); } thead th { position: relative; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1); } thead th:first-child { + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; border-top-left-radius: 5px; } thead th:last-child { + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; border-top-right-radius: 5px; } @@ -779,13 +843,14 @@ th { tbody td { border-top: 1px solid #747474; border-top: 1px solid rgba(0,0,0,.1); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1); background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); - background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(255,255,255,0.1)), to(rgba(255,255,255,0))); + background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); - background-image: -ms-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); - background-image: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); + background-image: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); background-image: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1affffff', endColorstr='#00ffffff',GradientType=0 ); } @@ -817,27 +882,30 @@ code.option, code.flag, code.filter, code.output { margin-left: -30px; padding: 20px 20px 24px; padding-left: 50px; + -webkit-border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; border-radius: 0 5px 5px 0; position: relative; + -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); + -moz-box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); background-color: #7e6d42; background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzdlNmQ0MiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1YzRlMzUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7e6d42), color-stop(100%,#5c4e35)); - background-image: -webkit-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(#7e6d42), to(#5c4e35)); + background-image: -webkit-linear-gradient(top, #7e6d42 0%, #5c4e35 100%); background-image: -moz-linear-gradient(top, #7e6d42 0%, #5c4e35 100%); - background-image: -ms-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); - background-image: -o-linear-gradient(top, #7e6d42 0%,#5c4e35 100%); + background-image: -o-linear-gradient(top, #7e6d42 0%, #5c4e35 100%); background-image: linear-gradient(to bottom, #7e6d42 0%,#5c4e35 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7e6d42', endColorstr='#5c4e35',GradientType=0 ); } -@media (max-width: 568px){ +@media (max-width: 568px) { .note { margin-right: -30px; } } -@media (min-width: 768px){ +@media (min-width: 768px) { .note { margin-left: -50px; } @@ -874,11 +942,10 @@ code.option, code.flag, code.filter, code.output { .info { background-color: #0389aa; background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAzODlhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDYxN2YiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0389aa), color-stop(100%,#00617f)); - background-image: -webkit-linear-gradient(top, #0389aa 0%,#00617f 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(#0389aa), to(#00617f)); + background-image: -webkit-linear-gradient(top, #0389aa 0%, #00617f 100%); background-image: -moz-linear-gradient(top, #0389aa 0%, #00617f 100%); - background-image: -ms-linear-gradient(top, #0389aa 0%,#00617f 100%); - background-image: -o-linear-gradient(top, #0389aa 0%,#00617f 100%); + background-image: -o-linear-gradient(top, #0389aa 0%, #00617f 100%); background-image: linear-gradient(to bottom, #0389aa 0%,#00617f 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0389aa', endColorstr='#00617f',GradientType=0 ); } @@ -886,26 +953,23 @@ code.option, code.flag, code.filter, code.output { .warning { background-color: #9e2812; background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); - background-image: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(#9e2812), to(#6f0d0d)); + background-image: -webkit-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); background-image: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); - background-image: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background-image: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background-image: -o-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); background-image: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); } .unreleased { - background-color: #cd9239; /* Old browsers */ - /* IE9 SVG, needs conditional override of 'filter' to 'none' */ + background-color: #cd9239; background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2NkOTIzOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNhMjc1MjgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(205,146,57,1)), color-stop(100%,rgba(162,117,40,1))); /* Chrome,Safari4+ */ - background-image: -webkit-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Chrome10+,Safari5.1+ */ - background-image: -moz-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); /* FF3.6+ */ - background-image: -ms-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* IE10+ */ - background-image: -o-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Opera 11.10+ */ - background-image: linear-gradient(to bottom, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cd9239', endColorstr='#a27528',GradientType=0 ); /* IE6-8 */ + background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(205,146,57,1)), to(rgba(162,117,40,1))); + background-image: -webkit-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); + background-image: -moz-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); + background-image: -o-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); + background-image: linear-gradient(to bottom, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cd9239', endColorstr='#a27528',GradientType=0 ); } .info:before { @@ -966,7 +1030,7 @@ code.option, code.flag, code.filter, code.output { /* Responsive tables */ -@media (max-width: 768px){ +@media (max-width: 768px) { .mobile-side-scroller { overflow-x: scroll; margin: 0 -40px; From 346820d6267e8ff81841eeacd3167fb699c37754 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Mar 2014 08:47:11 +0200 Subject: [PATCH 008/160] Simplify selectors. --- site/_includes/css/style.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index c957168d9..561f3e51c 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -31,7 +31,7 @@ body { /* Sections */ -body > header, body > section, body > footer { +header, section, footer { float: left; width: 100%; clear: both; @@ -39,11 +39,11 @@ body > header, body > section, body > footer { /* Header */ -body > header h1, body > header nav { +header h1, header nav { display: inline-block; } -body > header h1 span { +header h1 span { display: none; } @@ -148,7 +148,7 @@ nav li { /* Footer */ -body > footer { +footer { background-color: #222; font-size: 16px; padding-bottom: 5px; @@ -156,15 +156,15 @@ body > footer { margin-top: 40px; } -body > footer a { +footer a { color: #fff; } -body > footer .align-right p, body > footer img { +footer .align-right p, footer img { display: inline-block; } -body > footer img { +footer img { position: relative; top: 8px; margin-left: 5px; @@ -176,7 +176,7 @@ body > footer img { transition: opacity .2s; } -body > footer a:hover img { +footer a:hover img { opacity: 1; } From bae479972fe09793ed84bf03a829d1d429a437c1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 2 May 2014 11:24:18 -0400 Subject: [PATCH 009/160] Add document.output to list of liquid vars in output. CLoses #2232. --- site/docs/collections.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/site/docs/collections.md b/site/docs/collections.md index 847256cbd..cfbcd3a7f 100644 --- a/site/docs/collections.md +++ b/site/docs/collections.md @@ -155,13 +155,23 @@ In addition to any YAML front-matter provided in the document's corresponding fi

- The content of the document. If no YAML front-matter is provided, + The (unrendered) content of the document. If no YAML front-matter is provided, this is the entirety of the file contents. If YAML front-matter is used, then this is all the contents of the file after the terminating `---` of the front-matter.

+ + +

output

+ + +

+ The rendered output of the document, based on the content. +

+ +

path

From 11dcdf4fef9f614c1e6c2dd8567caf7e2a29263b Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Sat, 3 May 2014 00:23:50 +0200 Subject: [PATCH 010/160] Change Travis extension --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index f920db286..91f51258a 100644 --- a/README.markdown +++ b/README.markdown @@ -2,7 +2,7 @@ [![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll) -[![Build Status](https://secure.travis-ci.org/jekyll/jekyll.png?branch=master)](https://travis-ci.org/jekyll/jekyll) +[![Build Status](https://secure.travis-ci.org/jekyll/jekyll.svg?branch=master)](https://travis-ci.org/jekyll/jekyll) [![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll) [![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll) [![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll) From ddda89c33ef2343605b84f82808f8189ed1b600b Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Sat, 3 May 2014 00:25:34 +0200 Subject: [PATCH 011/160] Change Fury extension --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 91f51258a..b36e6c611 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,6 @@ # [Jekyll](http://jekyllrb.com/) -[![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll) +[![Gem Version](https://badge.fury.io/rb/jekyll.svg)](http://badge.fury.io/rb/jekyll) [![Build Status](https://secure.travis-ci.org/jekyll/jekyll.svg?branch=master)](https://travis-ci.org/jekyll/jekyll) [![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll) From e4b4b6e103c55956e2c337f4f4e9481a1d810af0 Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Sat, 3 May 2014 00:26:33 +0200 Subject: [PATCH 012/160] Change Gemnasium extension --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index b36e6c611..704a66b95 100644 --- a/README.markdown +++ b/README.markdown @@ -4,7 +4,7 @@ [![Build Status](https://secure.travis-ci.org/jekyll/jekyll.svg?branch=master)](https://travis-ci.org/jekyll/jekyll) [![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll) -[![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll) +[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll) [![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll) By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! From eade742b32256ea4bf371d147e1f8db9bb899d84 Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Sat, 3 May 2014 09:49:13 +0200 Subject: [PATCH 013/160] Switch to 2.1 --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 01ebd9286..5225cba03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,14 @@ install: - script/rebund download - travis_retry bundle install --path vendor/bundle rvm: -- 2.1.0 +# 2.1, not 2.1.0 until fixed https://github.com/travis-ci/travis-ci/issues/2220 +- 2.1 - 2.0.0 - 1.9.3 +matrix: + allow_failures: + # until fixed https://github.com/travis-ci/travis-ci/issues/2220 + - rvm: 2.1 script: script/cibuild after_script: - script/rebund upload From c17bdf951d3714a26a226497ec9aac3e005e2a6d Mon Sep 17 00:00:00 2001 From: Chezou Date: Sat, 3 May 2014 22:42:50 +0900 Subject: [PATCH 014/160] Fix typo in documentation --- site/docs/deployment-methods.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/docs/deployment-methods.md b/site/docs/deployment-methods.md index d10aabc74..97bbdefa6 100644 --- a/site/docs/deployment-methods.md +++ b/site/docs/deployment-methods.md @@ -27,7 +27,7 @@ There are also a number of ways to easily automate the deployment of a Jekyll si ### Git post-update hook -If you store your jekyll site in [Git](http://git-scm.com/) (you are using version control, right?), it’s pretty easy to automate the +If you store your Jekyll site in [Git](http://git-scm.com/) (you are using version control, right?), it’s pretty easy to automate the deployment process by setting up a post-update hook in your Git repository, [like this](http://web.archive.org/web/20091223025644/http://www.taknado.com/en/2009/03/26/deploying-a-jekyll-generated-site/). From 4ae8fefb9519fe81d27b742b63dbebbedd60c8e9 Mon Sep 17 00:00:00 2001 From: Valery Tolstov Date: Sat, 3 May 2014 20:23:28 +0400 Subject: [PATCH 015/160] Remove literal lang name from class, fix #2284 If code language is C classes for comment and language are the same --- lib/jekyll/converters/markdown/redcarpet_parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index d43eb140a..df18327b9 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -6,7 +6,7 @@ module Jekyll module CommonMethods def add_code_tags(code, lang) code = code.to_s - code = code.sub(/
/, "
")
+            code = code.sub(/
/, "
")
             code = code.sub(/<\/pre>/,"
")
           end
         end

From c3e858443f051aae16e615d66331a0e1e5df45ad Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 3 May 2014 12:55:14 -0400
Subject: [PATCH 016/160] Update history to reflect merge of #2291 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 8dacc2e9e..5be4ac50b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -201,6 +201,7 @@
   * Add `jekyll-live-tiles` to list of third-party plugins (#2250)
   * Fixed broken link to GitHub training material site source (#2257)
   * Update link to help repo, now called `jekyll-help` (#2277)
+  * Fix capitalization of 'Jekyll' on Deployment Methods page (#2291)
 
 ## 1.5.1 / 2014-03-27
 

From cf4304ab2b8424b5c33dc2bcfc0fa76b7cac7124 Mon Sep 17 00:00:00 2001
From: Valery Tolstov 
Date: Sat, 3 May 2014 21:46:16 +0400
Subject: [PATCH 017/160] Update tests

Remove language literal from class in test/test_redcarpet.rb
---
 test/test_redcarpet.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb
index dabcd62cd..ebf3b187f 100644
--- a/test/test_redcarpet.rb
+++ b/test/test_redcarpet.rb
@@ -32,7 +32,7 @@ class TestRedcarpet < Test::Unit::TestCase
       end
 
       should "render fenced code blocks with syntax highlighting" do
-        assert_equal "
puts "Hello world"\n
", @markdown.convert(
+        assert_equal "
puts "Hello world"\n
", @markdown.convert(
           <<-EOS
 ```ruby
 puts "Hello world"
@@ -48,7 +48,7 @@ puts "Hello world"
       end
 
       should "render fenced code blocks with syntax highlighting" do
-        assert_equal "
puts \"Hello world\"\n
", @markdown.convert(
+        assert_equal "
puts \"Hello world\"\n
", @markdown.convert(
           <<-EOS
 ```ruby
 puts "Hello world"
@@ -64,7 +64,7 @@ puts "Hello world"
       end
 
       should "render fenced code blocks without syntax highlighting" do
-        assert_equal "
puts "Hello world"\n
", @markdown.convert(
+        assert_equal "
puts "Hello world"\n
", @markdown.convert(
           <<-EOS
 ```ruby
 puts "Hello world"

From c48da38b14805e71de7e5e27e2eec4f52c0a0861 Mon Sep 17 00:00:00 2001
From: Anatol Broder 
Date: Sat, 3 May 2014 21:31:00 +0200
Subject: [PATCH 018/160] Switch 2.1 to 2.1.1

---
 .travis.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5225cba03..2c99fda9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,9 @@ install:
 - script/rebund download
 - travis_retry bundle install --path vendor/bundle
 rvm:
-# 2.1, not 2.1.0 until fixed https://github.com/travis-ci/travis-ci/issues/2220
-- 2.1
+- 2.1.1
 - 2.0.0
 - 1.9.3
-matrix:
-  allow_failures:
-  # until fixed https://github.com/travis-ci/travis-ci/issues/2220
-  - rvm: 2.1
 script: script/cibuild
 after_script:
 - script/rebund upload

From c0fa8702af59956cc9983ab559298c13b22e28bb Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 3 May 2014 18:21:04 -0400
Subject: [PATCH 019/160] Update history to reflect merge of #2290 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 5be4ac50b..b1ad1f742 100644
--- a/History.markdown
+++ b/History.markdown
@@ -130,6 +130,7 @@
   * Refactor `Commands::Serve`. (#2269)
   * Refactor `highlight` tag (#2154)
   * Update `Util` hash functions with latest from Rails (#2273)
+  * Workaround for Travis bug (#2290) 
 
 ### Site Enhancements
   * Document Kramdown's GFM parser option (#1791)

From adfd9091f8e8087f5d415051e60f23ee4ee5dee6 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 3 May 2014 18:27:00 -0400
Subject: [PATCH 020/160] Update history to reflect merge of #2292 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b1ad1f742..c4d709d9e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -64,6 +64,7 @@
   * Add the ability for pages to be marked as `published: false` (#1492)
   * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
     looking up of variable values in a Liquid context. (#2253)
+  * Remove literal lang name from class (#2292)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)

From 3af22f12bf177de440e7aba40751e7878a8d5a1c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 3 May 2014 18:51:55 -0400
Subject: [PATCH 021/160] Set content-type to text/html with utf-8 charset.

Fixes #2289
---
 lib/jekyll/commands/serve.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 316524904..0f6c6d371 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -44,8 +44,6 @@ module Jekyll
 
           Jekyll.logger.info "Server address:", server_address(s, options)
 
-          p s
-
           if options['detach'] # detach the server
             pid = Process.fork { s.start }
             Process.detach(pid)
@@ -66,6 +64,7 @@ module Jekyll
           if File.exist?(File.join(destination, '404.html'))
             WEBrick::HTTPResponse.class_eval do
               def create_error_page
+                @header['content-type'] = "text/html; charset=UTF-8"
                 @body = IO.read(File.join(@config[:DocumentRoot], '404.html'))
               end
             end

From 8cad40a124de7e28dc199948ecf416893458b4bc Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 3 May 2014 18:54:09 -0400
Subject: [PATCH 022/160] Update history to reflect merge of #2289 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c4d709d9e..6fdda7309 100644
--- a/History.markdown
+++ b/History.markdown
@@ -65,6 +65,7 @@
   * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
     looking up of variable values in a Liquid context. (#2253)
   * Remove literal lang name from class (#2292)
+  * Return `utf-8` encoding in header for  webrick error page response (#2289)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)

From f2849ac269d72ee505f165bc03323ca9b0275694 Mon Sep 17 00:00:00 2001
From: TheTomThorogood 
Date: Mon, 5 May 2014 00:12:07 +0930
Subject: [PATCH 023/160] Add :short_year to url_placeholders

---
 lib/jekyll/post.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 8ebe92b5c..13217bf0d 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -225,6 +225,7 @@ module Jekyll
         :i_month     => date.strftime("%m").to_i.to_s,
         :categories  => (categories || []).map { |c| c.to_s }.join('/'),
         :short_month => date.strftime("%b"),
+        :short_year  => date.strftime("%y"),
         :y_day       => date.strftime("%j"),
         :output_ext  => output_ext
       }

From 94ccd42c73776e51ab8ea3cd9656f22cc85973f7 Mon Sep 17 00:00:00 2001
From: TheTomThorogood 
Date: Mon, 5 May 2014 00:12:51 +0930
Subject: [PATCH 024/160] Add short_year description to /docs/permalinks/

---
 site/docs/permalinks.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/site/docs/permalinks.md b/site/docs/permalinks.md
index c38ad945b..155432bd4 100644
--- a/site/docs/permalinks.md
+++ b/site/docs/permalinks.md
@@ -67,6 +67,14 @@ permalink is defined as `/:categories/:year/:month/:day/:title.html`.
         
Day from the Post’s filename without leading zeros.

       
     
+    
+      
+        
short_year

+      
+      
+        
Year from the Post’s filename without the century.

+      
+    
     
       
         
title


From e04e11c84d6d4d0698b251cdc165286ad3317904 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 4 May 2014 21:05:14 -0400
Subject: [PATCH 025/160] Swap env of maruku and kramdown dependencies.

Maruku is now sunsetted, i.e. a dev dep, not a runtime dep.
Kramdown is now the default, i.e. a runtime dep, not a dev dep.
Closes #2285.
---
 jekyll.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 3dfb3cd0a..d61264a7b 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('liquid', "~> 2.5.5")
   s.add_runtime_dependency('classifier', "~> 1.3")
   s.add_runtime_dependency('listen', "~> 2.5")
-  s.add_runtime_dependency('maruku', "0.7.0")
+  s.add_runtime_dependency('kramdown', "~> 1.3")
   s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
   s.add_runtime_dependency('mercenary', "~> 0.3.1")
   s.add_runtime_dependency('safe_yaml', "~> 1.0")
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rr', "~> 1.1")
   s.add_development_dependency('cucumber', "1.3.11")
   s.add_development_dependency('RedCloth', "~> 4.2")
-  s.add_development_dependency('kramdown', "~> 1.3")
+  s.add_development_dependency('maruku', "0.7.0")
   s.add_development_dependency('rdiscount', "~> 1.6")
   s.add_development_dependency('launchy', "~> 2.3")
   s.add_development_dependency('simplecov', "~> 0.7")

From a0bbf7703bdda67ba7ef6fb94a22d29d1a676c4b Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Sun, 27 Apr 2014 15:34:01 -0400
Subject: [PATCH 026/160] make template site easier to customize

---
 lib/site_template/_config.yml                  | 13 +++++++++----
 lib/site_template/_includes/footer.html        | 18 +++++++++---------
 lib/site_template/_includes/head.html          |  6 +++---
 lib/site_template/_includes/header.html        |  9 +++++----
 lib/site_template/{about/index.md => about.md} |  3 ++-
 lib/site_template/feed.xml                     | 10 +++++-----
 lib/site_template/index.html                   |  9 ++++++---
 lib/site_template/projects/index.md            | 14 --------------
 8 files changed, 39 insertions(+), 43 deletions(-)
 rename lib/site_template/{about/index.md => about.md} (87%)
 delete mode 100644 lib/site_template/projects/index.md

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index d9fdcfc00..15256bf71 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -1,5 +1,10 @@
+# Site settings
 name: Dat site title tho
-markdown: redcarpet
-highlighter: pygments
-description: "Write an awesome description for your new site here. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
-url: "http://yourdomain.com"
+title: Your awesome title
+email: your-email@domain.com
+description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
+baseurl: "http://yourdomain.com"
+
+# Build settings
+markdown: kramdown
+permalinks: pretty
diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html
index 6c5dae3e4..9a286ecec 100644
--- a/lib/site_template/_includes/footer.html
+++ b/lib/site_template/_includes/footer.html
@@ -2,19 +2,19 @@
 
   

 
-    
Bart Simpson

+    
{{ site.name }}

 
     

       
     

 
     

       
     

 
     

-      
Any additional text you want to have here is totally cool for you to haz, yo.

+      
{{ site.description }}

     

 
   

 
-
\ No newline at end of file
+
diff --git a/lib/site_template/_includes/head.html b/lib/site_template/_includes/head.html
index 9f676224e..d54756159 100644
--- a/lib/site_template/_includes/head.html
+++ b/lib/site_template/_includes/head.html
@@ -4,9 +4,9 @@
     {% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}
     
     
-    
+    
 
     
-    
+    
 
-
\ No newline at end of file
+
diff --git a/lib/site_template/_includes/header.html b/lib/site_template/_includes/header.html
index 9c605cdef..f8045cbe5 100644
--- a/lib/site_template/_includes/header.html
+++ b/lib/site_template/_includes/header.html
@@ -2,7 +2,7 @@
 
   

 
-    {{ site.name }}
+    {{ site.name }}
 
     
 
   

 
-
\ No newline at end of file
+
diff --git a/lib/site_template/about/index.md b/lib/site_template/about.md
similarity index 87%
rename from lib/site_template/about/index.md
rename to lib/site_template/about.md
index 09ac935c4..3ed64bb62 100644
--- a/lib/site_template/about/index.md
+++ b/lib/site_template/about.md
@@ -1,10 +1,11 @@
 ---
 layout: page
 title: About
+permalink: /about/
 ---
 
 This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
 
 You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
 
-You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
\ No newline at end of file
+You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
diff --git a/lib/site_template/feed.xml b/lib/site_template/feed.xml
index 15b90dd65..252a0bd11 100644
--- a/lib/site_template/feed.xml
+++ b/lib/site_template/feed.xml
@@ -6,16 +6,16 @@ layout: none
   
     {{ site.name | xml_escape }}
     {{ site.description | xml_escape }}
-    {{ site.url }}
-    
+    {{ site.baseurl }}
+    
     {% for post in site.posts limit:10 %}
       
         {{ post.title | xml_escape }}
         {{ post.content | xml_escape }}
         {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}
-        {{ site.url }}/{{ post.url }}
-        {{ site.url }}/{{ post.url }}
+        {{ post.url | prepend: site.baseurl }}
+        {{ post.url | prepend: site.baseurl }}
       
     {% endfor %}
   
-
\ No newline at end of file
+
diff --git a/lib/site_template/index.html b/lib/site_template/index.html
index a14fd240f..a9f5097c6 100644
--- a/lib/site_template/index.html
+++ b/lib/site_template/index.html
@@ -8,10 +8,13 @@ layout: default
 
   
    
     {% for post in site.posts %}
-      
  • {{ post.date | date: "%b %-d, %Y" }} {{ post.title }}
    • 
+      
  • 
+        {{ post.date | date: "%b %-d, %Y" }}
+        {{ post.title }}
+      
    • 
     {% endfor %}
   

 
-  
subscribe via RSS

+  
subscribe via RSS

 
-
\ No newline at end of file
+
diff --git a/lib/site_template/projects/index.md b/lib/site_template/projects/index.md
deleted file mode 100644
index c45871341..000000000
--- a/lib/site_template/projects/index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: page
-title: Projects
----
-
-Just a sample of another page that you could include for some purpose in the primary navigation.
-
-This could be a great place to list your own projects. But to get you started, here's some handy links:
-
-- [List of Jekyll-powered websites](https://github.com/jekyll/jekyll/wiki/Sites)
-- [Octopress, a Jekyll based blog framework](https://github.com/octopress/)
-- [Jekyll documentation](http://jekyllrb.com/)
-- [Jekyll source on GitHub](https://github.com/jekyll/jekyll)
-- [Available plugins](http://jekyllrb.com/docs/plugins/#available_plugins)
\ No newline at end of file

From a2169bf0c4170e9dfae53e51ce07d508a745c3a5 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 4 May 2014 21:19:09 -0400
Subject: [PATCH 027/160] Have separate methods for all docs and just the docs
 that are being written.

---
 lib/jekyll/site.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index ccc6d2c60..3f57a83fd 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -405,7 +405,7 @@ module Jekyll
       end
     end
 
-    def documents
+    def docs_to_write
       collections.reduce(Set.new) do |docs, (_, collection)|
         if collection.write?
           docs.merge(collection.docs)
@@ -415,8 +415,14 @@ module Jekyll
       end
     end
 
+    def documents
+      collections.reduce(Set.new) do |docs, (_, collection)|
+        docs.merge(collection.docs)
+      end
+    end
+
     def each_site_file
-      %w(posts pages static_files documents).each do |type|
+      %w(posts pages static_files docs_to_write).each do |type|
         send(type).each do |item|
           yield item
         end

From 54b74fafba7d42d54a22abf4cb41033900a9aa0e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 4 May 2014 21:22:51 -0400
Subject: [PATCH 028/160] Add documents to site payload

---
 lib/jekyll/document.rb | 9 +++++++++
 lib/jekyll/site.rb     | 1 +
 2 files changed, 10 insertions(+)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 0a75fe966..3b2b6eeb2 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -228,5 +228,14 @@ module Jekyll
       path <=> anotherDocument.path
     end
 
+    # Determine whether this document should be written.
+    # Based on the Collection to which it belongs.
+    #
+    # True if the document has a collection and if that collection's #write?
+    #   method returns true, otherwise false.
+    def write?
+      collection && collection.write?
+    end
+
   end
 end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3f57a83fd..0b785e512 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -325,6 +325,7 @@ module Jekyll
           "categories"   => post_attr_hash('categories'),
           "tags"         => post_attr_hash('tags'),
           "collections"  => collections,
+          "documents"    => documents,
           "data"         => site_data
         }))
       }

From fc98f06ed718d0c077de888e4417c5a0e6b0a674 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 4 May 2014 21:22:57 -0400
Subject: [PATCH 029/160] Refactor docs_to_write

---
 lib/jekyll/site.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 0b785e512..5350edecc 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -407,13 +407,7 @@ module Jekyll
     end
 
     def docs_to_write
-      collections.reduce(Set.new) do |docs, (_, collection)|
-        if collection.write?
-          docs.merge(collection.docs)
-        else
-          docs
-        end
-      end
+      documents.select(&:write?)
     end
 
     def documents

From cb22320ae618db375f372d1b1243fcd1b46e586b Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 4 May 2014 21:23:47 -0400
Subject: [PATCH 030/160] Update history to reflect merge of #2268 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 6fdda7309..e0bd35a11 100644
--- a/History.markdown
+++ b/History.markdown
@@ -66,6 +66,7 @@
     looking up of variable values in a Liquid context. (#2253)
   * Remove literal lang name from class (#2292)
   * Return `utf-8` encoding in header for  webrick error page response (#2289)
+  * Make template site easier to customize (#2268)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)

From bcb88a4bc508e44a1f8db7ca6263b6304bd7fbda Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 03:00:00 -0400
Subject: [PATCH 031/160] Add Jekyll 2.0.0 release post.

---
 .../2014-05-05-jekyll-2-0-0-released.markdown | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 site/_posts/2014-05-05-jekyll-2-0-0-released.markdown

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
new file mode 100644
index 000000000..972adb5a5
--- /dev/null
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -0,0 +1,25 @@
+---
+layout: news_item
+title: 'Jekyll 2.0.0 Released'
+date: 2014-05-05 02:50:09 -0400
+author: parkr
+version: 2.0.0
+categories: [release]
+---
+
+It's here. After nearly 1,000 commits and about 5 months, the Jekyll team is excited to announce the release of Jekyll 2.0! Jam-packed with some [highly-requested features and bugfixes galore][changelog], this is the best Jekyll yet. Notable changes:
+
+1. [Collections](/docs/collections/)
+2. Brand new site template for `jekyll new` (thanks [@jglovier][]!)
+3. [Native Sass & CoffeeScript support](/docs/assets/)
+4. [YAML Front-Matter defaults](/docs/configuration/#frontmatter_defaults)
+5. Custom markdown processors
+6. Addition of `where` and `sort_by` Liquid filters
+7. Switch from Maruku to Kramdown as default markdown converter
+
+Check out our [changelog][] for a complete list of all (200+) changes.
+
+Happy developing!
+
+[changelog]: /docs/history/
+[@jglovier]: https://github.com/jglovier

From 7f88f80d8e99f83943bea7dcc6de52f0674fa9fc Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 03:01:28 -0400
Subject: [PATCH 032/160] Add nostalgia.

---
 site/_posts/2014-05-05-jekyll-2-0-0-released.markdown | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index 972adb5a5..1d1293834 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -7,7 +7,9 @@ version: 2.0.0
 categories: [release]
 ---
 
-It's here. After nearly 1,000 commits and about 5 months, the Jekyll team is excited to announce the release of Jekyll 2.0! Jam-packed with some [highly-requested features and bugfixes galore][changelog], this is the best Jekyll yet. Notable changes:
+One year ago, [we release Jekyll 1.0.0][]. One year later, we present to you the next major version: Jekyll 2.0.
+
+Jam-packed with some [highly-requested features and bugfixes galore][changelog], this is the best Jekyll yet. Some notable changes:
 
 1. [Collections](/docs/collections/)
 2. Brand new site template for `jekyll new` (thanks [@jglovier][]!)

From 491b3f8b1acff82fe92033f0f404aa09ce0893fa Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 03:05:37 -0400
Subject: [PATCH 033/160] Curse you, timezones.

---
 site/_posts/2014-05-05-jekyll-2-0-0-released.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index 1d1293834..c0386c5fc 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -7,7 +7,7 @@ version: 2.0.0
 categories: [release]
 ---
 
-One year ago, [we release Jekyll 1.0.0][]. One year later, we present to you the next major version: Jekyll 2.0.
+One year ago, [we released Jekyll 1.0.0][jekyll-1]. One year later, we present to you the next major version: Jekyll 2.0.
 
 Jam-packed with some [highly-requested features and bugfixes galore][changelog], this is the best Jekyll yet. Some notable changes:
 
@@ -25,3 +25,4 @@ Happy developing!
 
 [changelog]: /docs/history/
 [@jglovier]: https://github.com/jglovier
+[jekyll-1]: {% post_url 2013-05-05-jekyll-1-0-0-released %}

From 19e704f408268f037e9d612ae85adbf253583254 Mon Sep 17 00:00:00 2001
From: Anatol Broder 
Date: Mon, 5 May 2014 10:26:46 +0200
Subject: [PATCH 034/160] Override the sort filter

---
 lib/jekyll/filters.rb | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 997a0f5d8..ced9623fa 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -190,6 +190,29 @@ module Jekyll
       input.select { |object| object[key] == value }
     end
 
+    # Sort an array of objects
+    #
+    # input - the object array
+    # key - key within each object to filter by
+    # nils_last - nils appear after non-nil values in the sort ordering
+    #
+    # Returns the filtered array of objects
+    def sort(input, key = nil, nils_last = false)
+      if key.nil?
+        input.sort
+      else
+        input.sort { |a, b|
+          if a[key].nil? and !b[key].nil?
+            nils_last ? +1 : -1
+          elsif !a[key].nil? and b[key].nil?
+            nils_last ? -1 : +1
+          else
+            a[key] <=> b[key]
+          end
+        }
+      end
+    end
+
     private
     def time(input)
       case input

From 3517b9f4e2d2f7d38d448d49b9bb59f2419f875e Mon Sep 17 00:00:00 2001
From: Anatol Broder 
Date: Mon, 5 May 2014 10:35:19 +0200
Subject: [PATCH 035/160] Add scenario

---
 features/embed_filters.feature | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/features/embed_filters.feature b/features/embed_filters.feature
index 27f5f1df5..e0d85cbda 100644
--- a/features/embed_filters.feature
+++ b/features/embed_filters.feature
@@ -73,3 +73,19 @@ Feature: Embed filters
     Then the _site directory should exist
     And I should see exactly "Page-2, Page-1" in "_site/page-1.html"
     And I should see exactly "Page-2, Page-1" in "_site/page-2.html"
+
+  Scenario: Sort pages by the title
+    Given I have a _layouts directory
+    And I have the following page:
+      | title | layout | content |
+      | Dog | default | Run |
+    And I have the following page:
+      | title | layout | content |
+      | Bird | default | Fly |
+    And I have the following page:
+      | layout | content |
+      | default | Jump |
+    And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see exactly "The rule of 3: Jump, Fly, Run," in "_site/bird.html"

From 367a818c267408f364427e0e7eba1d2a4ea9ea14 Mon Sep 17 00:00:00 2001
From: Anatol Broder 
Date: Mon, 5 May 2014 10:37:21 +0200
Subject: [PATCH 036/160] Fallback title based on time

---
 features/support/env.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/features/support/env.rb b/features/support/env.rb
index 800206909..298756298 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -28,7 +28,11 @@ def run_jekyll(args)
 end
 
 def slug(title)
-  title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+  if title
+    title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+  else
+    Time.now.strftime("%s%9N") # nanoseconds since the Epoch
+  end
 end
 
 def location(folder, direction)

From 12d9f8b02bffb0cc779d78216d302758c7a4eb09 Mon Sep 17 00:00:00 2001
From: Anatol Broder 
Date: Mon, 5 May 2014 10:49:29 +0200
Subject: [PATCH 037/160] Add scenario for ordering pages without title last

---
 features/embed_filters.feature | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/features/embed_filters.feature b/features/embed_filters.feature
index e0d85cbda..b1a420f58 100644
--- a/features/embed_filters.feature
+++ b/features/embed_filters.feature
@@ -89,3 +89,19 @@ Feature: Embed filters
     When I run jekyll build
     Then the _site directory should exist
     And I should see exactly "The rule of 3: Jump, Fly, Run," in "_site/bird.html"
+
+  Scenario: Sort pages by the title ordering pages without title last
+    Given I have a _layouts directory
+    And I have the following page:
+      | title | layout | content |
+      | Dog | default | Run |
+    And I have the following page:
+      | title | layout | content |
+      | Bird | default | Fly |
+    And I have the following page:
+      | layout | content |
+      | default | Jump |
+    And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title', true %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see exactly "The rule of 3: Fly, Run, Jump," in "_site/bird.html"

From cc80aab1919ece7872af24f1ca735dea1e500464 Mon Sep 17 00:00:00 2001
From: Anatol Broder 
Date: Mon, 5 May 2014 11:14:07 +0200
Subject: [PATCH 038/160] Add generic tests

---
 test/test_filters.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 67bcd0962..0d3d8deff 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -152,5 +152,24 @@ class TestFilters < Test::Unit::TestCase
       end
     end
 
+    context "sort filter" do
+      should "return sorted array" do
+        assert_equal [1, 2, 3, 4], @filter.sort([4, 3, 2, 1])
+      end
+      should "return sorted by property array" do
+        assert_equal [{"a" => 1}, {"a" => 2}, {"a" => 3}, {"a" => 4}],
+          @filter.sort([{"a" => 4}, {"a" => 3}, {"a" => 1}, {"a" => 2}], "a")
+      end
+      should "return sorted by property array with nils first" do
+        ary = [{"a" => 2}, {"b" => 1}, {"a" => 1}]
+        assert_equal [{"b" => 1}, {"a" => 1}, {"a" => 2}], @filter.sort(ary, "a")
+        assert_equal @filter.sort(ary, "a"), @filter.sort(ary, "a", false)
+      end
+      should "return sorted by property array with nils last" do
+        assert_equal [{"a" => 1}, {"a" => 2}, {"b" => 1}],
+          @filter.sort([{"a" => 2}, {"b" => 1}, {"a" => 1}], "a", true)
+      end
+    end
+
   end
 end

From fe696991461df0a08bc48335ee798e32a7bd6438 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 13:33:18 -0400
Subject: [PATCH 039/160] Remove date, better title props @benbalter

---
 site/_posts/2014-05-05-jekyll-2-0-0-released.markdown | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index c0386c5fc..0c95f765c 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -1,7 +1,6 @@
 ---
 layout: news_item
-title: 'Jekyll 2.0.0 Released'
-date: 2014-05-05 02:50:09 -0400
+title: 'Jekyll turns 2.0.0'
 author: parkr
 version: 2.0.0
 categories: [release]

From 4c3c3a3f90e5c50dd3465a4aad58c38013bf9497 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 13:33:23 -0400
Subject: [PATCH 040/160] group_by not sort_by

---
 site/_posts/2014-05-05-jekyll-2-0-0-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index 0c95f765c..b22c7ed68 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -15,7 +15,7 @@ Jam-packed with some [highly-requested features and bugfixes galore][changelog],
 3. [Native Sass & CoffeeScript support](/docs/assets/)
 4. [YAML Front-Matter defaults](/docs/configuration/#frontmatter_defaults)
 5. Custom markdown processors
-6. Addition of `where` and `sort_by` Liquid filters
+6. Addition of `where` and `group_by` Liquid filters
 7. Switch from Maruku to Kramdown as default markdown converter
 
 Check out our [changelog][] for a complete list of all (200+) changes.

From 6b54b715d7ce0cdb33dd3f49135096ca1867a571 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 22:38:37 -0400
Subject: [PATCH 041/160] MAXIMUM NOSTALGIA

---
 site/_posts/2014-05-05-jekyll-2-0-0-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index b22c7ed68..b5ed83e3f 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -6,7 +6,7 @@ version: 2.0.0
 categories: [release]
 ---
 
-One year ago, [we released Jekyll 1.0.0][jekyll-1]. One year later, we present to you the next major version: Jekyll 2.0.
+Almost a year later to the day, [we released Jekyll 1.0.0][jekyll-1]. One year later, we present to you the next major version: Jekyll 2.0.
 
 Jam-packed with some [highly-requested features and bugfixes galore][changelog], this is the best Jekyll yet. Some notable changes:
 

From 7056da079de8360b0d2a1bfdbd4277b4798ff115 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 22:41:33 -0400
Subject: [PATCH 042/160] Add list of 2.0.0 contributors.

---
 site/_posts/2014-05-05-jekyll-2-0-0-released.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index b5ed83e3f..556d46d8b 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -20,6 +20,10 @@ Jam-packed with some [highly-requested features and bugfixes galore][changelog],
 
 Check out our [changelog][] for a complete list of all (200+) changes.
 
+Many thanks to these 183 contributors for making Jekyll 2.0.0 happen!
+
+Parker Moore, Matt Rogers, maul.esel, Anatol Broder, Zach Gersh, Joel Glovier, Ben Balter, XhmikosR, Coby Chapple, John Piasetzki, Aidan Feldman, Robin Dupret, Pascal Borreli, Troy Swanson, Erik Michaels-Ober, albertogg, Lucas Jenss, Matt Rogers & Persa Zula, Eric Mill, Shigeya Suzuki, Jens Nazarenus, ddavison, Pat Hawks, Rob Wierzbowski, MURAOKA Taro, Casey Lang, Fabian Rodriguez, Greg Karékinian, Zlatan Vasović, Christopher Nicotera, Dmitry Chestnykh, Ryan Morrissey, Jordon, John Hughes, akira yamada, Matt Swanson, Jashank Jeremy, Matthew Iversen, Meeka, liufengyun, Anand Narayan, nitoyon, Geoff Shannon, Benjamin J. Balter, Juan Ignacio Donoso, David Briggs, Benjamin Esham, Slava Pavlutin, Assaf Gelber, Josh Brown, Nick Fagerlund, Davide Ficano, pilosus, Anthony Smith, André Arko, Mikael Konutgan, Matthew Scharley, Dan Tao, scribu, Mort Yao, m, Stephen McDonald, Marcus Stollsteimer, Thomas Torsney-Weir, Jordon Bedwell, Tom Preston-Werner, Lincoln Mullen, Philip Poots, Ivan Tse, Christopher Giroir, Valery Tolstov, Wlodek Bzyl, Xavier Noria, Yi Zeng, Persa Zula, Phil Leggetter, Pirogov Evgenij, Rafael Revi, Rob McGuire-Dale, Rob Muhlestein, Robin Mehner, Roland Warmerdam, Rusty Geldmacher, Sam Rayner, Santeri Paavolainen, Sebastian Morr, Stephan Groß, Steven Spasbo, Tobias Brunner, Tuomas Kareinen, Tyler Margison, Uwe Dauernheim, Yihang Ho, Zach Leatherman, Zequez, andrew morton, andrewhavens, imathis, jannypie, jaybe@jekyll, kk_Ataka, markets, redwallhp, schneems, szymzet, thomasdao, tomsugden, wǒ_is神仙, 张君君, Noah Slater, Abhi Yerra, Adam Heckler, Ahmed Hazem, Aigars Dzerviniks, Aleksey V. Zapparov, Andreas Möller, Andy Lindeman, Arlen Cuss, Aziz Shamim, Ben Baker-Smith, Ben Hanzl, Ben Hildred, Brian Kim, Brice, Carol Nichols, Chezou, Chris Jones, Christian Grobmeier, Christoph Hochstrasser, Christoph Schiessl, Clint Shryock, Colin Dean, Corey Ward, Damian Lettie, Daniel Schauenberg, David Ensinger, David Paschich, David Sawyer, David Silva Smith, Donald Perry, Doug Johnston, Edward Ball, Eric Dobson, Erik Dungan, Florent Guilleux, Francis, Frederic ROS, GSI2013, Garen Torikian, George Anderson, Giuseppe Capizzi, Ishibashi Hideto, Jarrod Birch, Jeff Kolesky, Jens Bissinger, Jens Krause, John Firebaugh, John Papandriopoulos, Josh Branchaud, Katy DeCorah, Lachlan Holden, Mark Prins, Markus Roth, Martin Charles, Matt Iversen, Matt Sheehan, Matt Swensen, Matthias Vogelgesang, Michael Parker, Miha Rekar, Nathan Youngman, Nick Quaranto, Nick Quinlan, Nick Schonning, Nicolas Alpi, Nicolás Reynolds, Nikkau, 4ensicLog, Octavian Damiean, Olov Lassus, PatrickC8t, Paul Annesley, Paul Oppenheim,
+
 Happy developing!
 
 [changelog]: /docs/history/

From f1a00a01cf6f4780654908a552ce57d0d849b52b Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 23:37:17 -0400
Subject: [PATCH 043/160] Give them a 1/4" hole, which is what they want

---
 .../2014-05-05-jekyll-2-0-0-released.markdown  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index 556d46d8b..d6cdd7953 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -10,19 +10,19 @@ Almost a year later to the day, [we released Jekyll 1.0.0][jekyll-1]. One year l
 
 Jam-packed with some [highly-requested features and bugfixes galore][changelog], this is the best Jekyll yet. Some notable changes:
 
-1. [Collections](/docs/collections/)
-2. Brand new site template for `jekyll new` (thanks [@jglovier][]!)
-3. [Native Sass & CoffeeScript support](/docs/assets/)
-4. [YAML Front-Matter defaults](/docs/configuration/#frontmatter_defaults)
-5. Custom markdown processors
-6. Addition of `where` and `group_by` Liquid filters
-7. Switch from Maruku to Kramdown as default markdown converter
+1. [Collections](/docs/collections/) - Collections allow you to define an unlimited number of custom document types (beyond just posts and pages) for different types of content you may want to author in Jekyll such as API documentation or a cookbook!
+2. [Brand new site template](https://github.com/jekyll/jekyll/pull/2050#issuecomment-35938016) (thanks [@jglovier][]!) - Getting started with Jekyll just got a lot easier and a lot more beautiful. Just run `jekyll new ` and you're good to go.
+3. [Native Sass & CoffeeScript support](/docs/assets/) - We love CSS and JavaScript as much as the next guy, but there will always be a special place in our hearts for Sass and CoffeeScript. We now offer native support for these file types — no more messing around with Rake or Grunt!
+4. [YAML Front-Matter defaults](/docs/configuration/#frontmatter_defaults) - If you've set `layout: post` more than once in your life, you'll love this new feature: set front-matter defaults for a given directory or type.
+5. [Custom markdown processors](/docs/configuration/#custom_markdown_processors) - Always wanted to use your favourite home-grown Markdown converter, but couldn't with Jekyll? Now you can. Simply specify `markdown: MyConverterClass` and you're on your way.
+6. [Addition of `where` and `group_by` Liquid filters](/docs/templates/#filters) - Simplifying your Liquid templates one filter at a time. The `where` filter selects from an array all items within which have a given value for a property. The `group_by` filter groups all items in an array which have the same value for a given property.
+7. [Switch from Maruku to Kramdown as default markdown converter](https://github.com/jekyll/jekyll/pull/1988) - Maruku is dead. We've replaced it with the converter which has the closest feature parity: Kramdown!
 
 Check out our [changelog][] for a complete list of all (200+) changes.
 
-Many thanks to these 183 contributors for making Jekyll 2.0.0 happen!
+Many thanks to these 183 contributors for making Jekyll 2.0.0 happen:
 
-Parker Moore, Matt Rogers, maul.esel, Anatol Broder, Zach Gersh, Joel Glovier, Ben Balter, XhmikosR, Coby Chapple, John Piasetzki, Aidan Feldman, Robin Dupret, Pascal Borreli, Troy Swanson, Erik Michaels-Ober, albertogg, Lucas Jenss, Matt Rogers & Persa Zula, Eric Mill, Shigeya Suzuki, Jens Nazarenus, ddavison, Pat Hawks, Rob Wierzbowski, MURAOKA Taro, Casey Lang, Fabian Rodriguez, Greg Karékinian, Zlatan Vasović, Christopher Nicotera, Dmitry Chestnykh, Ryan Morrissey, Jordon, John Hughes, akira yamada, Matt Swanson, Jashank Jeremy, Matthew Iversen, Meeka, liufengyun, Anand Narayan, nitoyon, Geoff Shannon, Benjamin J. Balter, Juan Ignacio Donoso, David Briggs, Benjamin Esham, Slava Pavlutin, Assaf Gelber, Josh Brown, Nick Fagerlund, Davide Ficano, pilosus, Anthony Smith, André Arko, Mikael Konutgan, Matthew Scharley, Dan Tao, scribu, Mort Yao, m, Stephen McDonald, Marcus Stollsteimer, Thomas Torsney-Weir, Jordon Bedwell, Tom Preston-Werner, Lincoln Mullen, Philip Poots, Ivan Tse, Christopher Giroir, Valery Tolstov, Wlodek Bzyl, Xavier Noria, Yi Zeng, Persa Zula, Phil Leggetter, Pirogov Evgenij, Rafael Revi, Rob McGuire-Dale, Rob Muhlestein, Robin Mehner, Roland Warmerdam, Rusty Geldmacher, Sam Rayner, Santeri Paavolainen, Sebastian Morr, Stephan Groß, Steven Spasbo, Tobias Brunner, Tuomas Kareinen, Tyler Margison, Uwe Dauernheim, Yihang Ho, Zach Leatherman, Zequez, andrew morton, andrewhavens, imathis, jannypie, jaybe@jekyll, kk_Ataka, markets, redwallhp, schneems, szymzet, thomasdao, tomsugden, wǒ_is神仙, 张君君, Noah Slater, Abhi Yerra, Adam Heckler, Ahmed Hazem, Aigars Dzerviniks, Aleksey V. Zapparov, Andreas Möller, Andy Lindeman, Arlen Cuss, Aziz Shamim, Ben Baker-Smith, Ben Hanzl, Ben Hildred, Brian Kim, Brice, Carol Nichols, Chezou, Chris Jones, Christian Grobmeier, Christoph Hochstrasser, Christoph Schiessl, Clint Shryock, Colin Dean, Corey Ward, Damian Lettie, Daniel Schauenberg, David Ensinger, David Paschich, David Sawyer, David Silva Smith, Donald Perry, Doug Johnston, Edward Ball, Eric Dobson, Erik Dungan, Florent Guilleux, Francis, Frederic ROS, GSI2013, Garen Torikian, George Anderson, Giuseppe Capizzi, Ishibashi Hideto, Jarrod Birch, Jeff Kolesky, Jens Bissinger, Jens Krause, John Firebaugh, John Papandriopoulos, Josh Branchaud, Katy DeCorah, Lachlan Holden, Mark Prins, Markus Roth, Martin Charles, Matt Iversen, Matt Sheehan, Matt Swensen, Matthias Vogelgesang, Michael Parker, Miha Rekar, Nathan Youngman, Nick Quaranto, Nick Quinlan, Nick Schonning, Nicolas Alpi, Nicolás Reynolds, Nikkau, 4ensicLog, Octavian Damiean, Olov Lassus, PatrickC8t, Paul Annesley, Paul Oppenheim,
+Parker Moore, Matt Rogers, maul.esel, Anatol Broder, Zach Gersh, Joel Glovier, Ben Balter, XhmikosR, Coby Chapple, John Piasetzki, Aidan Feldman, Robin Dupret, Pascal Borreli, Troy Swanson, Erik Michaels-Ober, albertogg, Lucas Jenss, Matt Rogers & Persa Zula, Eric Mill, Shigeya Suzuki, Jens Nazarenus, ddavison, Pat Hawks, Rob Wierzbowski, MURAOKA Taro, Casey Lang, Fabian Rodriguez, Greg Karékinian, Zlatan Vasović, Christopher Nicotera, Dmitry Chestnykh, Ryan Morrissey, Jordon, John Hughes, akira yamada, Matt Swanson, Jashank Jeremy, Matthew Iversen, Meeka, liufengyun, Anand Narayan, nitoyon, Geoff Shannon, Benjamin J. Balter, Juan Ignacio Donoso, David Briggs, Benjamin Esham, Slava Pavlutin, Assaf Gelber, Josh Brown, Nick Fagerlund, Davide Ficano, pilosus, Anthony Smith, André Arko, Mikael Konutgan, Matthew Scharley, Dan Tao, scribu, Mort Yao, m, Stephen McDonald, Marcus Stollsteimer, Thomas Torsney-Weir, Jordon Bedwell, Tom Preston-Werner, Lincoln Mullen, Philip Poots, Ivan Tse, Christopher Giroir, Valery Tolstov, Wlodek Bzyl, Xavier Noria, Yi Zeng, Persa Zula, Phil Leggetter, Pirogov Evgenij, Rafael Revi, Rob McGuire-Dale, Rob Muhlestein, Robin Mehner, Roland Warmerdam, Rusty Geldmacher, Sam Rayner, Santeri Paavolainen, Sebastian Morr, Stephan Groß, Steven Spasbo, Tobias Brunner, Tuomas Kareinen, Tyler Margison, Uwe Dauernheim, Yihang Ho, Zach Leatherman, Zequez, andrew morton, andrewhavens, imathis, jannypie, jaybe@jekyll, kk_Ataka, markets, redwallhp, schneems, szymzet, thomasdao, tomsugden, wǒ_is神仙, 张君君, Noah Slater, Abhi Yerra, Adam Heckler, Ahmed Hazem, Aigars Dzerviniks, Aleksey V. Zapparov, Andreas Möller, Andy Lindeman, Arlen Cuss, Aziz Shamim, Ben Baker-Smith, Ben Hanzl, Ben Hildred, Brian Kim, Brice, Carol Nichols, Chezou, Chris Jones, Christian Grobmeier, Christoph Hochstrasser, Christoph Schiessl, Clint Shryock, Colin Dean, Corey Ward, Damian Lettie, Daniel Schauenberg, David Ensinger, David Paschich, David Sawyer, David Silva Smith, Donald Perry, Doug Johnston, Edward Ball, Eric Dobson, Erik Dungan, Florent Guilleux, Francis, Frederic ROS, GSI2013, Garen Torikian, George Anderson, Giuseppe Capizzi, Ishibashi Hideto, Jarrod Birch, Jeff Kolesky, Jens Bissinger, Jens Krause, John Firebaugh, John Papandriopoulos, Josh Branchaud, Katy DeCorah, Lachlan Holden, Mark Prins, Markus Roth, Martin Charles, Matt Iversen, Matt Sheehan, Matt Swensen, Matthias Vogelgesang, Michael Parker, Miha Rekar, Nathan Youngman, Nick Quaranto, Nick Quinlan, Nick Schonning, Nicolas Alpi, Nicolás Reynolds, Nikkau, 4ensicLog, Octavian Damiean, Olov Lassus, PatrickC8t, Paul Annesley, and Paul Oppenheim.
 
 Happy developing!
 

From 2f660674c3044a818170209aea4803d3ecf31ea0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 23:37:25 -0400
Subject: [PATCH 044/160] Add docs for group_by and where filters

---
 site/docs/templates.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/site/docs/templates.md b/site/docs/templates.md
index a4c791845..12ae5d418 100644
--- a/site/docs/templates.md
+++ b/site/docs/templates.md
@@ -79,6 +79,32 @@ common tasks easier.
         

       
     
+    
+      
+        
Where

+        
Select all the object in an array where the key has the given.

+      
+      
+        

+         {% raw %}{{ site.members | where:"graduation_year","2014" }}{% endraw %}
+        

+      
+    
+    
+      
+        
Group By

+        
Group an array's items by a given property.

+      
+      
+        

+         {% raw %}{{ site.members | group_by:"graduation_year" }}{% endraw %}
+        

+        

+          [{"name"=>"2013", "items"=>[...]},
+{"name"=>"2014", "items"=>[...]}]
+        

+      
+    
     
       
         
XML Escape


From 581b07d09674c327dd2d6401f3cbebdc7d4f3ebe Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 23:45:18 -0400
Subject: [PATCH 045/160] Add docs about custom markdown processor

---
 .../2014-05-05-jekyll-2-0-0-released.markdown |  2 +-
 site/docs/configuration.md                    | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index d6cdd7953..b5a15e694 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -14,7 +14,7 @@ Jam-packed with some [highly-requested features and bugfixes galore][changelog],
 2. [Brand new site template](https://github.com/jekyll/jekyll/pull/2050#issuecomment-35938016) (thanks [@jglovier][]!) - Getting started with Jekyll just got a lot easier and a lot more beautiful. Just run `jekyll new ` and you're good to go.
 3. [Native Sass & CoffeeScript support](/docs/assets/) - We love CSS and JavaScript as much as the next guy, but there will always be a special place in our hearts for Sass and CoffeeScript. We now offer native support for these file types — no more messing around with Rake or Grunt!
 4. [YAML Front-Matter defaults](/docs/configuration/#frontmatter_defaults) - If you've set `layout: post` more than once in your life, you'll love this new feature: set front-matter defaults for a given directory or type.
-5. [Custom markdown processors](/docs/configuration/#custom_markdown_processors) - Always wanted to use your favourite home-grown Markdown converter, but couldn't with Jekyll? Now you can. Simply specify `markdown: MyConverterClass` and you're on your way.
+5. [Custom markdown processors](/docs/configuration/#custom-markdown-processors) - Always wanted to use your favourite home-grown Markdown converter, but couldn't with Jekyll? Now you can. Simply specify `markdown: MyConverterClass` and you're on your way.
 6. [Addition of `where` and `group_by` Liquid filters](/docs/templates/#filters) - Simplifying your Liquid templates one filter at a time. The `where` filter selects from an array all items within which have a given value for a property. The `group_by` filter groups all items in an array which have the same value for a given property.
 7. [Switch from Maruku to Kramdown as default markdown converter](https://github.com/jekyll/jekyll/pull/1988) - Maruku is dead. We've replaced it with the converter which has the closest feature parity: Kramdown!
 
diff --git a/site/docs/configuration.md b/site/docs/configuration.md
index b93f973e9..c273ca6a4 100644
--- a/site/docs/configuration.md
+++ b/site/docs/configuration.md
@@ -454,3 +454,30 @@ For example, in your `_config.yml`:
 
     kramdown:
       input: GFM
+
+### Custom Markdown Processors
+
+If you're interested in creating a custom markdown processor, you're in luck! Create a new class in the `Jekyll::Converters::Markdown` namespace:
+
+{% highlight ruby %}
+class Jekyll::Converters::Markdown::MyCustomProcessor
+  def initialize(config)
+    require 'funky_markdown'
+    @config = config
+  rescue LoadError
+    STDERR.puts 'You are missing a library required for Markdown. Please run:'
+    STDERR.puts '  $ [sudo] gem install funky_markdown'
+    raise FatalException.new("Missing dependency: funky_markdown")
+  end
+
+  def convert(content)
+    ::FunkyMarkdown.new(content).convert
+  end
+end
+{% endhighlight %}
+
+Once you've created your class and have it properly setup either as a plugin in the `_plugins` folder or as a gem, specify it in your `_config.yml`:
+
+{% highlight yaml %}
+markdown: MyCustomProcessor
+{% endhighlight %}

From 851d17e028bed84c1a004437333c37da080abc00 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 5 May 2014 23:46:41 -0400
Subject: [PATCH 046/160] Update history to reflect merge of #2297 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index e0bd35a11..c724b59d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -206,6 +206,7 @@
   * Fixed broken link to GitHub training material site source (#2257)
   * Update link to help repo, now called `jekyll-help` (#2277)
   * Fix capitalization of 'Jekyll' on Deployment Methods page (#2291)
+  * Include plugins by sonnym in list of third-party plugins (#2297)
 
 ## 1.5.1 / 2014-03-27
 

From d002ebd3737bc7aa04c8a336003da92642baef76 Mon Sep 17 00:00:00 2001
From: kzykbys 
Date: Mon, 5 May 2014 20:53:02 -0700
Subject: [PATCH 047/160] Add Deprecated articles keeper plugin

---
 site/docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/docs/plugins.md b/site/docs/plugins.md
index 571f4b8f2..90ac813eb 100644
--- a/site/docs/plugins.md
+++ b/site/docs/plugins.md
@@ -462,6 +462,7 @@ You can find a few useful plugins at the following locations:
 - [Table of Content Generator](https://github.com/dafi/jekyll-toc-generator): Generate the HTML code containing a table of content (TOC), the TOC can be customized in many way, for example you can decide which pages can be without TOC.
 - [jekyll-humanize](https://github.com/23maverick23/jekyll-humanize): This is a port of the Django app humanize which adds a "human touch" to data. Each method represents a Fluid type filter that can be used in your Jekyll site templates. Given that Jekyll produces static sites, some of the original methods do not make logical sense to port (e.g. naturaltime).
 - [Jekyll-Ordinal](https://github.com/PatrickC8t/Jekyll-Ordinal): Jekyll liquid filter to output a date ordinal such as "st", "nd", "rd", or "th".
+- [Deprecated articles keeper](https://github.com/kzykbys/JekyllPlugins) by [Kazuya Kobayashi](http://blog.kazuya.co/): A simple Jekyll filter which monitor how old an article is.
 
 #### Tags
 

From 3755437d089674102289edea4dab5c0c99c96ea5 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 6 May 2014 00:11:35 -0400
Subject: [PATCH 048/160] Write test for site.documents.

---
 features/collections.feature | 12 ++++++++++++
 lib/jekyll/site.rb           |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/features/collections.feature b/features/collections.feature
index 32e9161cd..402e7daba 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -70,3 +70,15 @@ Feature: Collections
     When I run jekyll build
     Then the _site directory should exist
     And I should see "Collections: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+
+  Scenario: All the documents
+    Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "All documents: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 5350edecc..5ebf3c20a 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -413,7 +413,7 @@ module Jekyll
     def documents
       collections.reduce(Set.new) do |docs, (_, collection)|
         docs.merge(collection.docs)
-      end
+      end.to_a
     end
 
     def each_site_file

From 9c9e96cfa7bfe73f41e2d35a71f822907000c554 Mon Sep 17 00:00:00 2001
From: Anatol Broder 
Date: Tue, 6 May 2014 07:48:33 +0200
Subject: [PATCH 049/160] Add lexicographical sort test

---
 test/test_filters.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 0d3d8deff..940932591 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -169,6 +169,12 @@ class TestFilters < Test::Unit::TestCase
         assert_equal [{"a" => 1}, {"a" => 2}, {"b" => 1}],
           @filter.sort([{"a" => 2}, {"b" => 1}, {"a" => 1}], "a", true)
       end
+      should "return lexicographical sorted array" do
+        assert_equal [2, 10], @filter.sort([10, 2])
+        assert_equal [{"a" => 2}, {"a" => 10}], @filter.sort([{"a" => 10}, {"a" => 2}], "a")
+        assert_equal ["10", "2"], @filter.sort(["10", "2"])
+        assert_equal [{"a" => "10"}, {"a" => "2"}], @filter.sort([{"a" => "10"}, {"a" => "2"}], "a")
+      end
     end
 
   end

From 5bf40983564ffe85a21eee9048f5339fc3ca4913 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 6 May 2014 12:14:50 -0400
Subject: [PATCH 050/160] Update history to reflect merge of #2301 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c724b59d8..7ae25c843 100644
--- a/History.markdown
+++ b/History.markdown
@@ -67,6 +67,7 @@
   * Remove literal lang name from class (#2292)
   * Return `utf-8` encoding in header for  webrick error page response (#2289)
   * Make template site easier to customize (#2268)
+  * Add two-digit year to permalink template option (#2301)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)

From b2d7938cec6dab0ad9f0db00689166d66a45f2ff Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 6 May 2014 12:18:00 -0400
Subject: [PATCH 051/160] Speak English properly.

---
 site/_posts/2014-05-05-jekyll-2-0-0-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
index b5a15e694..35ab3d43e 100644
--- a/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
+++ b/site/_posts/2014-05-05-jekyll-2-0-0-released.markdown
@@ -6,7 +6,7 @@ version: 2.0.0
 categories: [release]
 ---
 
-Almost a year later to the day, [we released Jekyll 1.0.0][jekyll-1]. One year later, we present to you the next major version: Jekyll 2.0.
+Almost a year ago to the day, [we released Jekyll 1.0.0][jekyll-1]. One year later, we present to you the next major version: Jekyll 2.0.0.
 
 Jam-packed with some [highly-requested features and bugfixes galore][changelog], this is the best Jekyll yet. Some notable changes:
 

From 79fb58713516f904fc67431800c1a3973f936674 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 6 May 2014 12:28:24 -0400
Subject: [PATCH 052/160] Update history to reflect merge of #2300 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 7ae25c843..6900cfd76 100644
--- a/History.markdown
+++ b/History.markdown
@@ -208,6 +208,7 @@
   * Update link to help repo, now called `jekyll-help` (#2277)
   * Fix capitalization of 'Jekyll' on Deployment Methods page (#2291)
   * Include plugins by sonnym in list of third-party plugins (#2297)
+  * Add deprecated articles keeper filter to list of third-party plugins (#2300)
 
 ## 1.5.1 / 2014-03-27
 

From 3eafb29eb8ab7eafb01373c078ab92866fb975b7 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 6 May 2014 12:29:42 -0400
Subject: [PATCH 053/160] Update history to reflect merge of #2295 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 6900cfd76..fe3945736 100644
--- a/History.markdown
+++ b/History.markdown
@@ -68,6 +68,7 @@
   * Return `utf-8` encoding in header for  webrick error page response (#2289)
   * Make template site easier to customize (#2268)
   * Add two-digit year to permalink template option (#2301)
+  * Add `site.documents` to Liquid payload (list of all docs) (#2295)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)

From 1a38207fafbc3eb5145f8edba122535ac77194ba Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 6 May 2014 12:31:33 -0400
Subject: [PATCH 054/160] Add docs for site.documents.

Ref: #2295.
---
 site/docs/variables.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/site/docs/variables.md b/site/docs/variables.md
index d6c7390b4..8e6c22c7b 100644
--- a/site/docs/variables.md
+++ b/site/docs/variables.md
@@ -125,6 +125,17 @@ following is a reference of the available data.
 
       

     
+    
+      
site.documents

+      

+
+        A list of all the documents in every collection.
+        Note: this is only available in the latest development
+        version.
+
+      

+    
     
       
site.categories.CATEGORY

       


From caeca36a40dce7062c42e62b2fa866ebf7128e8d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 6 May 2014 12:33:10 -0400
Subject: [PATCH 055/160] Update history to reflect merge of #2127 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index fe3945736..7ae2b5f4e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -210,6 +210,7 @@
   * Fix capitalization of 'Jekyll' on Deployment Methods page (#2291)
   * Include plugins by sonnym in list of third-party plugins (#2297)
   * Add deprecated articles keeper filter to list of third-party plugins (#2300)
+  * Simplify and improve our CSS. (#2127)
 
 ## 1.5.1 / 2014-03-27
 

From 9da5e74287cb96da37a5aa1aa36cd08757ce8c8e Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Tue, 6 May 2014 19:21:37 +0300
Subject: [PATCH 056/160] Update html5shiv to v3.7.2.

---
 site/_includes/top.html  | 2 +-
 site/js/html5shiv.js     | 8 --------
 site/js/html5shiv.min.js | 4 ++++
 3 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 site/js/html5shiv.js
 create mode 100644 site/js/html5shiv.min.js

diff --git a/site/_includes/top.html b/site/_includes/top.html
index a03125827..35ba2f260 100644
--- a/site/_includes/top.html
+++ b/site/_includes/top.html
@@ -11,7 +11,7 @@
   
   
   
 
diff --git a/site/js/html5shiv.js b/site/js/html5shiv.js
deleted file mode 100644
index 448cebd79..000000000
--- a/site/js/html5shiv.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x";
-c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
-"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
-if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.2",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b)}(this,document);
\ No newline at end of file

From e4c3a8d0dfff56d6a0e2501351ee4d7a38fee9d9 Mon Sep 17 00:00:00 2001
From: jbranchaud 
Date: Fri, 14 Feb 2014 16:02:26 -0300
Subject: [PATCH 057/160] Adding two new test cases for exclude configuration
 use cases.

---
 test/test_entry_filter.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index aea09601b..e562277e3 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -25,6 +25,22 @@ class TestEntryFilter < Test::Unit::TestCase
       assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
     end
 
+    should "filter entries with exclude relative to site source" do
+      excludes = %w[README TODO css]
+      files = %w[index.html vendor/css .htaccess]
+
+      @site.exclude = excludes
+      assert_equal files, @site.filter_entries(excludes + files + ["css"])
+    end
+
+    should "filter excluded directory and contained files" do
+      excludes = %w[README TODO css]
+      files = %w[index.html .htaccess]
+
+      @site.exclude = excludes
+      assert_equal files, @site.filter_entries(excludes + files + ["css", "css/main.css", "css/vendor.css"])
+    end
+
     should "not filter entries within include" do
       includes = %w[_index.html .htaccess include*]
       files = %w[index.html _index.html .htaccess includeA]

From 413de3a0ee60943021ce623c4f193b68cb17efcc Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 6 May 2014 12:46:41 -0400
Subject: [PATCH 058/160] Also exclude an entry if it starts with one of the
 items given in the exclude key.

---
 lib/jekyll/entry_filter.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 0b00218b8..d2cd6f81e 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -65,9 +65,7 @@ module Jekyll
       entry = ensure_leading_slash(e)
       enum.any? do |exp|
         item = ensure_leading_slash(exp)
-        Jekyll.logger.debug "glob_include?(#{entry})"
-        Jekyll.logger.debug "    ==> File.fnmatch?(#{item}, #{entry}) == #{File.fnmatch?(item, entry)}"
-        File.fnmatch?(item, entry)
+        File.fnmatch?(item, entry) || entry.start_with?(item)
       end
     end
   end

From 067b137ed9416ac0714a64c7ac1ea622acd6107d Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Tue, 6 May 2014 19:45:00 +0300
Subject: [PATCH 059/160] Use the built in date filter for the copyright year.

---
 site/_includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_includes/footer.html b/site/_includes/footer.html
index 6ceb6fcd2..c42b1a469 100644
--- a/site/_includes/footer.html
+++ b/site/_includes/footer.html
@@ -1,7 +1,7 @@