diff --git a/.gitignore b/.gitignore index 1e06d0d136..52c7b04b65 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ dlangspec.d /web /2.*.ddoc Makefile +css/cssmenu.css deleteme.* docs-prerelease.json diff --git a/css/cssmenu.css.dd b/css/cssmenu.css.dd index 5684e80eb1..fb8fb59559 100644 --- a/css/cssmenu.css.dd +++ b/css/cssmenu.css.dd @@ -111,11 +111,13 @@ Ddoc } /* Sub menu */ #cssmenu ul ul { - /*display: none;*/ background: $(submenu_bg); border-right: 1px solid $(submenu_border); border-left: 1px solid $(submenu_border); } +body.have-javascript #cssmenu ul ul { + display: none; +} #cssmenu ul ul li { padding: 0; border-bottom: 1px solid $(bottom_submenu_li); diff --git a/dlang.org.ddoc b/dlang.org.ddoc index c410b51e6e..979b4e1a4b 100644 --- a/dlang.org.ddoc +++ b/dlang.org.ddoc @@ -134,7 +134,7 @@ _= MDASH=$(T nobr,  — ) METACODE=$(SPANC metacode, $0) -MENU =
  • $+
    • +MENU =
  • $+
    • MENU_W_SUBMENU =
  • $0 META_KEYWORDS=D programming language META_DESCRIPTION=D Programming Language diff --git a/doc.ddoc b/doc.ddoc index 8139ab5709..4c6900af41 100644 --- a/doc.ddoc +++ b/doc.ddoc @@ -39,6 +39,7 @@ function bodyLoad() ) +$(SCRIPT document.body.className += ' have-javascript';) $(DIVID top, $(DIVID search-box,
    diff --git a/js/cssmenu.js b/js/cssmenu.js index c775422fac..705e621aa8 100755 --- a/js/cssmenu.js +++ b/js/cssmenu.js @@ -10,6 +10,8 @@ $('#cssmenu > ul > li > ul > li > a').each(function(){ p = p.parent(); p.addClass('active'); p.show(); + p = p.parent(); + p.addClass('active'); } }); diff --git a/std.ddoc b/std.ddoc index f9b5a59092..435bf15a33 100644 --- a/std.ddoc +++ b/std.ddoc @@ -20,6 +20,7 @@ $(SCRIPTLOAD ../js/cssmenu.js) $(SCRIPT jQuery(document).ready(listanchors);) +$(SCRIPT document.body.className += ' have-javascript';) $(DIVID top, $(divid search-box, diff --git a/win32.mak b/win32.mak index 8dd8266c5e..627f8bda0f 100644 --- a/win32.mak +++ b/win32.mak @@ -14,7 +14,7 @@ SRC= $(SPECSRC) cpptod.dd ctod.dd pretod.dd cppcontracts.dd index.dd overview.dd tuple.dd template-comparison.dd COM.dd hijack.dd features2.dd safed.dd \ const-faq.dd concepts.dd d-floating-point.dd migrate-to-shared.dd \ D1toD2.dd intro-to-datetime.dd simd.dd deprecate.dd download.dd \ - 32-64-portability.dd dll-linux.dd bugstats.php.dd + 32-64-portability.dd dll-linux.dd bugstats.php.dd css\cssmenu.css.dd SPECSRC=spec.dd intro.dd lex.dd grammar.dd module.dd declaration.dd type.dd property.dd \ attribute.dd pragma.dd expression.dd statement.dd arrays.dd \ @@ -51,7 +51,7 @@ TARGETS=cpptod.html ctod.html pretod.html cppcontracts.html index.html overview. memory-safe-d.html d-floating-point.html migrate-to-shared.html \ D1toD2.html unittest.html hash-map.html intro-to-datetime.html \ simd.html deprecate.html download.html 32-64-portability.html \ - d-array-article.html dll-linux.html bugstats.php.html + d-array-article.html dll-linux.html bugstats.php.html css/cssmenu.css CHMTARGETS=d.hhp d.hhc d.hhk d.chm @@ -254,6 +254,9 @@ windbg.html : $(DDOC) windows.ddoc windbg.dd windows.html : $(DDOC) windows.ddoc windows.dd +css/cssmenu.css : $(DDOC) css/cssmenu.css.dd + $(DMD) -o- -c -Df$@ $(DDOC) css/cssmenu.css.dd + ################ Ebook ######################## dlangspec.d : $(SPECSRC) win32.mak