diff --git a/assets/images/docs-2.png b/assets/images/docs-2.png index dfc88c68..2bd5bdbe 100644 Binary files a/assets/images/docs-2.png and b/assets/images/docs-2.png differ diff --git a/assets/images/docs-2@2x.png b/assets/images/docs-2@2x.png index 07c8c9d4..ed34377a 100644 Binary files a/assets/images/docs-2@2x.png and b/assets/images/docs-2@2x.png differ diff --git a/assets/javascripts/news.json b/assets/javascripts/news.json index aa7a99c8..875cef4f 100644 --- a/assets/javascripts/news.json +++ b/assets/javascripts/news.json @@ -1,7 +1,7 @@ [ [ "2018-07-29", - "New documentation: Pygame" + "New documentations: Bash and Pygame" ], [ "2018-07-08", "New documentations: Leaflet, Terraform and Koa" diff --git a/assets/stylesheets/global/_icons.scss b/assets/stylesheets/global/_icons.scss index 546cc26e..098f176b 100644 --- a/assets/stylesheets/global/_icons.scss +++ b/assets/stylesheets/global/_icons.scss @@ -174,3 +174,4 @@ ._icon-leaflet:before { background-position: -3rem -3rem; @extend %doc-icon-2; } ._icon-terraform:before { background-position: -4rem -3rem; @extend %doc-icon-2; } ._icon-pygame:before { background-position: -5rem -3rem; @extend %doc-icon-2; } +._icon-bash:before { background-position: -6rem -3rem; @extend %doc-icon-2; } diff --git a/assets/stylesheets/pages/_bash.scss b/assets/stylesheets/pages/_bash.scss index c22d0493..b6ca1808 100644 --- a/assets/stylesheets/pages/_bash.scss +++ b/assets/stylesheets/pages/_bash.scss @@ -1,22 +1,12 @@ ._bash { - // The page title is always the first element on the page, but not always the same type of element - // The exception is the homepage, where the links element comes first - > *:first-child:not(._links) { - @extend h1; - @extend %lined-heading; - } - dl > dt > code, dl > dt > kbd { - @extend %note, %note-blue; - display: block; - padding: 1px 7px 2px 7px; - margin: 28px 0 14px 0; - font-weight: bold; - font-family: $baseFont; + @extend %block-label, %label-blue; } th[align=left] { - border-left: 1px solid #d8d8d8; + border-left: 1px solid $boxBorder; } + + code { @extend %label; } } diff --git a/lib/docs/filters/bash/clean_html.rb b/lib/docs/filters/bash/clean_html.rb index d35bac63..13234027 100644 --- a/lib/docs/filters/bash/clean_html.rb +++ b/lib/docs/filters/bash/clean_html.rb @@ -11,6 +11,7 @@ module Docs # Remove chapter and section numbers from title title_node = at_css('h1, h2, h3, h4, h5, h6') title_node.content = title_node.content.gsub(/(\d+\.?)+/, '').strip + title_node.name = 'h1' # Remove the "D. " from names like "D. Concept Index" and "D. Function Index" title_node.content = title_node.content[3..-1] if title_node.content.start_with?("D. ") @@ -56,6 +57,16 @@ module Docs node.children = link unless link.nil? end + css('tt', 'code', 'table').remove_attr('class') + + css('tt').each do |node| + node.name = 'code' + end + + css('pre').each do |node| + node.content = node.content + end + doc end end diff --git a/public/icons/docs-2.pxm b/public/icons/docs-2.pxm index 82696ea8..37cdd6d7 100644 Binary files a/public/icons/docs-2.pxm and b/public/icons/docs-2.pxm differ diff --git a/public/icons/docs-2@2x.pxm b/public/icons/docs-2@2x.pxm index 7bb215b3..fcc1aafb 100644 Binary files a/public/icons/docs-2@2x.pxm and b/public/icons/docs-2@2x.pxm differ diff --git a/public/icons/docs/bash/16.png b/public/icons/docs/bash/16.png index 2dbb2ebd..083d83b2 100644 Binary files a/public/icons/docs/bash/16.png and b/public/icons/docs/bash/16.png differ diff --git a/public/icons/docs/bash/16@2x.png b/public/icons/docs/bash/16@2x.png index b9456a24..3b7aa0bc 100644 Binary files a/public/icons/docs/bash/16@2x.png and b/public/icons/docs/bash/16@2x.png differ