diff --git a/resources/main.js b/resources/main.js index 6ed26b5..679b59d 100644 --- a/resources/main.js +++ b/resources/main.js @@ -71,36 +71,61 @@ $(function() { } else { $('#toc').each(function() { var $toc = $(this); - var $title = $toc.find('#toctitle'); - var $links = $title.siblings('ul'); + var $title = $toc.find('.toctitle'); + var $links = $title.siblings('ul').find( 'a' ); - $('.page-header').prepend('
'); + $.each( $links.find( '.tocnumber' ), function() { + var $el = $( this ); + var numDots = ( $el.text().match( /\./g ) || [] ).length; + var prefix = ''; + for ( var i = 0; i < numDots; i++ ) { + prefix += ' '; + } - $('.page-header #page-contents').find('.dropdown-menu').html( $links.html() ); + $el.prepend( prefix ); + } ); + + $links.addClass( 'dropdown-item' ); + + var toc_html = [ + ' ' + ]; + + $('.page-header').prepend( toc_html.join( ' ' ) ); + + $('.page-header #page-contents').find('.dropdown-menu').html( $links ); }); if( $('.page-header .nav').length === 0 ) { - $('.page-header').prepend(' '); + $('.page-header').prepend(' '); }//end if var $header = $('.page-header'); - var $hero = $('.hero-unit'); + var $hero = $('.jumbotron'); var $edit = $('.navbar .content-actions .edit'); if( $edit.length > 0 ) { + var $editListItem = $( '' ); + $edit.clone().removeClass( 'dropdown-item' ).addClass( 'nav-link' ).prependTo( $editListItem ); + if( $hero.length ) { if( ! $hero.find('.nav-pills').length ) { - $hero.prepend(' '); + $hero.prepend(' '); }//end if - $edit.closest('li').clone().prependTo( $hero.find('.nav-pills') ); + $editListItem.prependTo( $hero.find('.nav-pills') ); } else { - $edit.closest('li').clone().prependTo( $header.find('.nav-pills') ); + $editListItem.prependTo( $header.find('.nav-pills') ); }//end else }//end if }//end if - prettyPrint(); - $('#wiki-body .body a[title="Special:UserLogin"]').click(); $('.dropdown-toggle').dropdown(); }); diff --git a/style.css b/style.css index 8878c4c..87113ae 100644 --- a/style.css +++ b/style.css @@ -167,8 +167,6 @@ option.unclickable { overflow-y: scroll; right: 0; } -#page-contents .dropdown-menu { -} .page-header .nav i { opacity: 0.3; @@ -213,6 +211,12 @@ option.unclickable { margin-left: 20px; } +#toc.toc-sidebar li li, +.mw-content-ltr .toc ul ul { + margin-left: 0; + padding-left: 0; +} + #toc.toc-sidebar h3 { font-size: 1em; } @@ -230,9 +234,10 @@ a.new { } #catlinks { - border-top: 1px dotted #eee; - margin-top: 2em; - padding: 1em 0; + background: #fafafa; + border: 1px dotted #eee; + margin-top: 2rem; + padding: 1rem; } #catlinks #mw-normal-catlinks > a { @@ -439,7 +444,6 @@ img.thumbborder { pre.linenums ol { margin-bottom: 0; - margin-left: 0; } #wiki-outer-body { @@ -812,6 +816,7 @@ table.list th { /* Specify class=linenums on a pre to get line numbering */ .mediawiki ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */ +.mediawiki ol.linenums li::marker { color: #aaa; } /* IE indents via margin-left */ .mediawiki li.L0, .mediawiki li.L1, .mediawiki li.L2, @@ -819,7 +824,7 @@ table.list th { .mediawiki li.L5, .mediawiki li.L6, .mediawiki li.L7, -.mediawiki li.L8 { list-style-type: none } +.mediawiki li.L8 { list-style-type: decimal !important; } /* Alternate shading for lines */ .mediawiki li.L1, .mediawiki li.L3,