Merge pull request #165 from tripit/dev

Update master, all done, thanks @lord
This commit is contained in:
Tariq Islam 2015-01-28 05:44:25 -08:00
commit bb5c721450
4 changed files with 4 additions and 14 deletions

View file

@ -1,5 +1,3 @@
require './lib/redcarpet_header_fix'
set :css_dir, 'stylesheets'
set :js_dir, 'javascripts'

View file

@ -1,9 +0,0 @@
module RedcarpetHeaderFix
def header(text, level)
clean_id = text.downcase.gsub(/( +|\.+)/, '-').gsub(/[^a-zA-Z0-9\-_]/, '')
"<h#{level} id='#{clean_id}'>#{text}</h#{level}>"
end
end
require 'middleman-core/renderers/redcarpet'
Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, RedcarpetHeaderFix

View file

@ -26,9 +26,9 @@ under the License.
$(".lang-selector a").removeClass('active');
$(".lang-selector a[data-language-name='" + language + "']").addClass('active');
for (var i=0; i < languages.length; i++) {
$(".highlight." + languages[i]).hide();
$(".highlight." + languages[i]).parent().hide();
}
$(".highlight." + language).show();
$(".highlight." + language).parent().show();
global.toc.calculateHeights();

View file

@ -307,8 +307,9 @@ html, body {
text-decoration: none;
padding: 0 10px;
line-height: 30px;
outline: 0;
&:active {
&:active, &:focus {
background-color: $lang-select-pressed-bg;
color: $lang-select-pressed-text;
}