diff --git a/assets/javascripts/views/pages/javascript.coffee b/assets/javascripts/views/pages/javascript.coffee index ea5ad9be..c5e572fc 100644 --- a/assets/javascripts/views/pages/javascript.coffee +++ b/assets/javascripts/views/pages/javascript.coffee @@ -11,5 +11,4 @@ class app.views.JavascriptWithMarkupCheckPage extends app.views.BasePage return app.views.DojoPage = -app.views.RequirejsPage = app.views.JavascriptWithMarkupCheckPage diff --git a/assets/javascripts/views/pages/simple.coffee b/assets/javascripts/views/pages/simple.coffee index d1a53337..1d325020 100644 --- a/assets/javascripts/views/pages/simple.coffee +++ b/assets/javascripts/views/pages/simple.coffee @@ -60,6 +60,7 @@ app.views.PostgresPage = app.views.RamdaPage = app.views.ReactPage = app.views.ReduxPage = +app.views.RequirejsPage = app.views.RethinkdbPage = app.views.RubydocPage = app.views.RustPage = diff --git a/assets/stylesheets/application-dark.css.scss b/assets/stylesheets/application-dark.css.scss index 80d4ce75..8e719586 100644 --- a/assets/stylesheets/application-dark.css.scss +++ b/assets/stylesheets/application-dark.css.scss @@ -82,7 +82,6 @@ 'pages/rdoc', 'pages/react', 'pages/redis', - 'pages/requirejs', 'pages/rethinkdb', 'pages/rfc', 'pages/rubydoc', diff --git a/assets/stylesheets/application.css.scss b/assets/stylesheets/application.css.scss index ea8e5772..21ce39a3 100644 --- a/assets/stylesheets/application.css.scss +++ b/assets/stylesheets/application.css.scss @@ -82,7 +82,6 @@ 'pages/rdoc', 'pages/react', 'pages/redis', - 'pages/requirejs', 'pages/rethinkdb', 'pages/rfc', 'pages/rubydoc', diff --git a/assets/stylesheets/pages/_requirejs.scss b/assets/stylesheets/pages/_requirejs.scss deleted file mode 100644 index 34fddb4c..00000000 --- a/assets/stylesheets/pages/_requirejs.scss +++ /dev/null @@ -1,5 +0,0 @@ -._requirejs { - @extend %simple; - - ul.index ul { margin: .5em 0; } -} diff --git a/assets/stylesheets/pages/_simple.scss b/assets/stylesheets/pages/_simple.scss index 6db17ba3..39ab4435 100644 --- a/assets/stylesheets/pages/_simple.scss +++ b/assets/stylesheets/pages/_simple.scss @@ -39,6 +39,7 @@ ._mocha, ._mongoose, ._redux, +._requirejs, ._typescript, ._vagrant, ._yarn { diff --git a/lib/docs/filters/requirejs/clean_html.rb b/lib/docs/filters/requirejs/clean_html.rb index 56d55121..3222fdff 100644 --- a/lib/docs/filters/requirejs/clean_html.rb +++ b/lib/docs/filters/requirejs/clean_html.rb @@ -5,7 +5,7 @@ module Docs css('.sectionMark', '.hbox > .sect').remove css('h1 + .note').remove if root_page? - css('.section', 'pre > code').each do |node| + css('.section').each do |node| node.before(node.children).remove end @@ -15,6 +15,11 @@ module Docs link.before(link.children).remove end + css('pre > code').each do |node| + node.parent['data-language'] = node.content =~ /\A\s*