diff --git a/assets/stylesheets/application-dark.css.scss b/assets/stylesheets/application-dark.css.scss index edac5fc0..0e40ef14 100644 --- a/assets/stylesheets/application-dark.css.scss +++ b/assets/stylesheets/application-dark.css.scss @@ -35,27 +35,21 @@ 'pages/chai', 'pages/clojure', 'pages/coffeescript', - 'pages/cordova', 'pages/d3', 'pages/ember', 'pages/express', + 'pages/git', 'pages/go', 'pages/haskell', 'pages/jquery', 'pages/knockout', - 'pages/git', - 'pages/grunt', 'pages/laravel', - 'pages/less', 'pages/lua', - 'pages/marionette', - 'pages/markdown', 'pages/maxcdn', 'pages/mdn', 'pages/meteor', 'pages/modernizr', 'pages/moment', - 'pages/mongoose', 'pages/nginx', 'pages/node', 'pages/php', diff --git a/assets/stylesheets/application.css.scss b/assets/stylesheets/application.css.scss index a1ab6d15..a7810b94 100644 --- a/assets/stylesheets/application.css.scss +++ b/assets/stylesheets/application.css.scss @@ -35,27 +35,21 @@ 'pages/chai', 'pages/clojure', 'pages/coffeescript', - 'pages/cordova', 'pages/d3', 'pages/ember', 'pages/express', + 'pages/git', 'pages/go', 'pages/haskell', 'pages/jquery', 'pages/knockout', - 'pages/git', - 'pages/grunt', 'pages/laravel', - 'pages/less', 'pages/lua', - 'pages/marionette', - 'pages/markdown', 'pages/maxcdn', 'pages/mdn', 'pages/meteor', 'pages/modernizr', 'pages/moment', - 'pages/mongoose', 'pages/nginx', 'pages/node', 'pages/php', diff --git a/assets/stylesheets/pages/_base.scss b/assets/stylesheets/pages/_base.scss index a544e8af..0d61b1ab 100644 --- a/assets/stylesheets/pages/_base.scss +++ b/assets/stylesheets/pages/_base.scss @@ -1,10 +1,7 @@ %simple { padding-left: 1rem; - h1, h2, h3 { - position: relative; - left: -1rem; - } + h1, h2, h3 { margin-left: -1rem; } h2 { @extend %block-heading; } h3 { @extend %block-label, %label-blue; } h4 { font-size: inherit; } @@ -12,14 +9,21 @@ ._mobile & { padding-left: 0; - h1, h2, h3 { left: 0; } + h1, h2, h3 { margin-left: 0; } } - code { @extend %label; } + p > code, li > code { @extend %label; } + blockquote { @extend %note; } } +._cordova, +._grunt, +._less, ._lodash, -._sinon, -._mocha { +._marionette, +._markdown, +._mocha, +._mongoose, +._sinon { @extend %simple; } diff --git a/assets/stylesheets/pages/_chai.scss b/assets/stylesheets/pages/_chai.scss index a74567e8..19c24ab5 100644 --- a/assets/stylesheets/pages/_chai.scss +++ b/assets/stylesheets/pages/_chai.scss @@ -1,13 +1,5 @@ ._chai { - padding-left: 1rem; - - > h1, > h2, h3 { margin-left: -1rem; } - > h2 { @extend %block-heading; } - h3 { @extend %block-label, %label-blue; } - h4 { font-size: 1em; } - - code { @extend %label; } - blockquote { @extend %note; } + @extend %simple; li.tag span { margin-right: 5px; } } diff --git a/assets/stylesheets/pages/_coffeescript.scss b/assets/stylesheets/pages/_coffeescript.scss index 99f7a5ef..af4125fd 100644 --- a/assets/stylesheets/pages/_coffeescript.scss +++ b/assets/stylesheets/pages/_coffeescript.scss @@ -1,10 +1,5 @@ ._coffeescript { - padding-left: 1rem; - - > h1, > h2 { margin-left: -1rem; } - > h2 { @extend %block-heading; } - - code { @extend %label; } + @extend %simple; // CoffeeScript / JavaScript code blocks > .code { diff --git a/assets/stylesheets/pages/_cordova.scss b/assets/stylesheets/pages/_cordova.scss deleted file mode 100644 index 3667d56e..00000000 --- a/assets/stylesheets/pages/_cordova.scss +++ /dev/null @@ -1,10 +0,0 @@ -._cordova { - padding-left: 1rem; - - > h1, > h2 { margin-left: -1rem; } - > h2 { @extend %block-heading; } - > h3 { font-size: 1rem; } - - code { @extend %label; } - blockquote { @extend %note; } -} diff --git a/assets/stylesheets/pages/_express.scss b/assets/stylesheets/pages/_express.scss index 9115a55f..de1bf21e 100644 --- a/assets/stylesheets/pages/_express.scss +++ b/assets/stylesheets/pages/_express.scss @@ -1,10 +1,6 @@ ._express { - padding-left: 1rem; + @extend %simple; - h1, h2, h3 { margin-left: -1rem; } - h2 { @extend %block-heading; } - h3 { @extend %block-label, %label-blue; } - p > code { @extend %label; } .doc-box { @extend %note; } .doc-warn { @extend %note-red; } } diff --git a/assets/stylesheets/pages/_go.scss b/assets/stylesheets/pages/_go.scss index 08c19bf9..218fa0df 100644 --- a/assets/stylesheets/pages/_go.scss +++ b/assets/stylesheets/pages/_go.scss @@ -1,7 +1,5 @@ ._go { - padding-left: 1rem; + @extend %simple; - h1, h2, #short-nav, table.dir { margin-left: -1rem; } - h2 { @extend %block-heading; } - h3 { @extend %block-label, %label-blue; } + #short-nav, table.dir { margin-left: -1rem; } } diff --git a/assets/stylesheets/pages/_grunt.scss b/assets/stylesheets/pages/_grunt.scss deleted file mode 100644 index 592653fb..00000000 --- a/assets/stylesheets/pages/_grunt.scss +++ /dev/null @@ -1,8 +0,0 @@ -._grunt { - padding-left: 1rem; - - h1, h2, h3 { margin-left: -1rem; } - h2 { @extend %block-heading; } - h3 { @extend %block-label, %label-blue; } - p > code { @extend %label; } -} diff --git a/assets/stylesheets/pages/_less.scss b/assets/stylesheets/pages/_less.scss deleted file mode 100644 index 57cb44d3..00000000 --- a/assets/stylesheets/pages/_less.scss +++ /dev/null @@ -1,8 +0,0 @@ -._less { - padding-left: 1rem; - - > h1, > h2, h3, h4 { margin-left: -1rem; } - > h2 { @extend %block-heading; } - h3, h4 { @extend %block-label, %label-blue; } - code { @extend %label; } -} diff --git a/assets/stylesheets/pages/_lua.scss b/assets/stylesheets/pages/_lua.scss index 2d8a7897..68cca61e 100644 --- a/assets/stylesheets/pages/_lua.scss +++ b/assets/stylesheets/pages/_lua.scss @@ -1,10 +1,5 @@ ._lua { - padding-left: 1rem; - - h1, h2 { margin-left: -1rem; } - h2 { @extend %block-heading; } - h3 { @extend %block-label, %label-blue; } - h4 { font-size: inherit; } + @extend %simple; .apii { float: right; } } diff --git a/assets/stylesheets/pages/_marionette.scss b/assets/stylesheets/pages/_marionette.scss deleted file mode 100644 index 0613dfa2..00000000 --- a/assets/stylesheets/pages/_marionette.scss +++ /dev/null @@ -1,8 +0,0 @@ -._marionette { - padding-left: 1rem; - - > h1, > h2 { margin-left: -1rem; } - > h2 { @extend %block-heading; } - > h3 { @extend %block-label, %label-blue; } - blockquote { @extend %note; } -} diff --git a/assets/stylesheets/pages/_markdown.scss b/assets/stylesheets/pages/_markdown.scss deleted file mode 100644 index 63c7e3d6..00000000 --- a/assets/stylesheets/pages/_markdown.scss +++ /dev/null @@ -1,7 +0,0 @@ -._markdown { - padding-left: 1rem; - - h1, h2, h3, h1 + ul { margin-left: -1rem; } - h2 { @extend %block-heading; } - h3 { @extend %block-label, %label-blue; } -} diff --git a/assets/stylesheets/pages/_maxcdn.scss b/assets/stylesheets/pages/_maxcdn.scss index 91f9a199..bc0a94ef 100644 --- a/assets/stylesheets/pages/_maxcdn.scss +++ b/assets/stylesheets/pages/_maxcdn.scss @@ -1,11 +1,5 @@ ._maxcdn { - padding-left: 1rem; - - h1, h2, h3 { margin-left: -1rem; } - h2 { @extend %block-heading; } - h3 { @extend %block-label, %label-blue; } - h4 { font-size: 1em; } - p > code { @extend %label; } + @extend %simple; .url { padding: .5rem; diff --git a/assets/stylesheets/pages/_mongoose.scss b/assets/stylesheets/pages/_mongoose.scss deleted file mode 100644 index 0a76f58e..00000000 --- a/assets/stylesheets/pages/_mongoose.scss +++ /dev/null @@ -1,8 +0,0 @@ -._mongoose { - padding-left: 1rem; - - > h1, > h2, > h3 { margin-left: -1rem; } - > h2 { @extend %block-heading; } - > h3 { @extend %block-label, %label-blue; } - h4 { font-size: 1em; } -} diff --git a/assets/stylesheets/pages/_requirejs.scss b/assets/stylesheets/pages/_requirejs.scss index d186cca4..34fddb4c 100644 --- a/assets/stylesheets/pages/_requirejs.scss +++ b/assets/stylesheets/pages/_requirejs.scss @@ -1,10 +1,5 @@ ._requirejs { - padding-left: 1rem; - - h1, h2, h3, ul.index { margin-left: -1rem; } - h2 { @extend %block-heading; } - h3 { @extend %block-label, %label-blue; } - h4 { font-size: 1em; } + @extend %simple; ul.index ul { margin: .5em 0; } } diff --git a/lib/docs/filters/less/clean_html.rb b/lib/docs/filters/less/clean_html.rb index 9075ae03..74a7a222 100644 --- a/lib/docs/filters/less/clean_html.rb +++ b/lib/docs/filters/less/clean_html.rb @@ -22,7 +22,7 @@ module Docs end css('h1, h2, h3, h4').each do |node| - node.name = node.name.sub(/\d/) { |i| i.to_i + 1 } + node.name = node.name.sub(/\d/) { |i| [i.to_i + 1, 3].min } end css('pre').each do |node| diff --git a/lib/docs/filters/less/entries.rb b/lib/docs/filters/less/entries.rb index b37295a7..135e1dd2 100644 --- a/lib/docs/filters/less/entries.rb +++ b/lib/docs/filters/less/entries.rb @@ -23,7 +23,7 @@ module Docs end css('h3[id^="import-options-"]').each do |node| - entries << ["@import #{node.content}", node['id']] + entries << ["@import #{node.content}", node['id']] unless node.content =~ /example/i end entries.concat [ @@ -52,7 +52,7 @@ module Docs if node.name == 'h2' type = node.content type.sub! %r{(.+) Functions}, 'Functions: \1' - elsif node.name == 'h4' + elsif node.name == 'h3' entries << [node.content, node['id'], type] end end