Fixed <div> and <form> nesting

kinaba · Apr 4, 2011 · 743539f · 743539f
1 parent db05d46
commit 743539f
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 43 deletions.
diff --git a/css/style.css b/css/style.css
@@ -1,5 +1,6 @@
 body
 {
+    text-align: justify;
 	margin: 0;
 	padding: 0;
 	border: 0;
@@ -108,12 +109,12 @@ dd
 
 table, tr, td, th
 {
-	border-style: solid;
+	/*border-style: solid;*/
 }
 
 td
 {
-	text-align: left;
+	text-align: justify;
 }
 
 hr
@@ -204,10 +205,10 @@ td .d_code2, td .cppcode2, td .cppcode
 	margin: 1em 0em;
 }
 
-.d_inlinecode 
+.d_inlinecode
 {
 	font-family: monospace;
-	font-size: 1.2em;
+	/* font-size: 1.2em; */
 	font-weight: bold;
 }
 

diff --git a/doc.ddoc b/doc.ddoc
@@ -41,26 +41,27 @@ function bodyLoad()
 </head>
 
 <body onload="bodyLoad()">
-	<div id="top">
+
+<div id="top">
+	<div id="search-box">
 		<form method="get" action="http://www.google.com/search">
-			<div id="search-box">
-				<img src="images/search-left.gif" width="11" height="22" /><input id="q" name="q" /><input type="image" id="search-submit" name="submit" src="images/search-button.gif" />
-				<input type="hidden" id="domains" name="domains" value="www.digitalmars.com" />
-				<input type="hidden" id="sourceid" name="sourceid" value="google-search" />
-				<div id="search-dropdown">
-					<select id="sitesearch" name="sitesearch" size="1">
-						<option value="www.digitalmars.com/d/$(VER)">Entire D $(VER) Site</option>
-						<option value="www.digitalmars.com/d/$(VER)/phobos">Library Reference</option>
-						<option value="www.digitalmars.com/d/archives">Newsgroup Archives</option>
-					</select>
-	</div>
+			<img src="/images/search-left.gif" width="11" height="22" /><input id="q" name="q" /><input type="image" id="search-submit" name="submit" src="/images/search-button.gif" />
+			<input type="hidden" id="domains" name="domains" value="www.digitalmars.com" />
+			<input type="hidden" id="sourceid" name="sourceid" value="google-search" />
+			<div id="search-dropdown">
+				<select id="sitesearch" name="sitesearch" size="1">
+					<option value="www.digitalmars.com/d/$(VER)">Entire D $(VER) Site</option>
+					<option value="www.digitalmars.com/d/$(VER)/phobos">Library Reference</option>
+					<option value="www.digitalmars.com/d/archives">Newsgroup Archives</option>
+				</select>
 			</div>
 		</form>
+	</div>
+</div>
 
-		<div id="header">
-			<!--a href="http://www.digitalmars.com"><img id="logo" width="253" height="37" border="0" alt="Digital Mars" src="images/dmlogo.gif"></a-->
-			<div id="d-language"><a href="">D Programming Language $(VER)</a></div>
-		</div>
+<div id="header">
+	<!--a href="/"><img id="logo" border="0" alt="D" src="/images/dlogo.png"></a-->
+	<div id="d-language"><a href="">D Programming Language $(VER)</a></div>
 </div>
 
 $(BODY)
@@ -121,7 +122,7 @@ GOOGLE_REFERRAL=
 COPYRIGHT=
 Copyright &copy; 1999-$(YEAR) by Digital Mars &reg;, All Rights Reserved
 
-FOOTER= 
+FOOTER=
 <div id="footernav">
 <a href="http://www.digitalmars.com/NewsGroup.html" title="User Forums">Forums</a> |
 <a href="http://www.prowiki.org/wiki4d/wiki.cgi?DocComments/$(WIKI)" title="Read/write comments and feedback">Comments</a> |

diff --git a/lex.dd b/lex.dd
@@ -16,7 +16,7 @@ $(SPEC_S Lexical,
 	The process of compiling is divided into multiple phases. Each phase
 	has no dependence on subsequent phases. For example, the scanner is
 	not perturbed by the semantic analyzer. This separation of the passes
-	makes language tools like syntax 
+	makes language tools like syntax
 	directed editors relatively easy to produce.
 	It also is possible to compress D source by storing it in
 	$(SINGLEQUOTE tokenized) form.
@@ -50,7 +50,7 @@ $(OL
 
 	$(LI $(B semantic analysis)$(BR)
 
-	The syntax trees are traversed to declare variables, load symbol tables, assign 
+	The syntax trees are traversed to declare variables, load symbol tables, assign
 	types, and in general determine the meaning of the program.
 	)
 
@@ -73,7 +73,7 @@ $(OL
 
 	D source text can be in one of the following formats:
 
-	$(UL 
+	$(UL
 	$(LI ASCII)
 	$(LI UTF-8)
 	$(LI UTF-16BE)
@@ -210,7 +210,7 @@ $(I NestingBlockCommentCharacter):
 )
 
 	D has three kinds of comments:
-	$(OL 
+	$(OL
 	$(LI Block comments can span multiple lines, but do not nest.)
 	$(LI Line comments terminate at the end of the line.)
 	$(LI Nesting comments can span multiple lines and can nest.)
@@ -1154,7 +1154,7 @@ $(V2
 	$(B wchar)
 	$(B while)
 	$(B with)
-$(V2 
+$(V2
 	$(B __FILE__)
 	$(B __LINE__)
 	$(B __gshared)
@@ -1253,4 +1253,4 @@ x;			// this is now line 6 of file foo\bar
 Macros:
 	TITLE=Lexical
 	WIKI=Lex
-
+	CATEGORY_SPEC=$0
diff --git a/linux.mak b/linux.mak
@@ -4,7 +4,7 @@ DMD=dmd
 
 DDOC=macros.ddoc windows.ddoc doc.ddoc
 
-IMAGES=$(addprefix images/, c1.gif d3.gif dmlogo.gif					\
+IMAGES=$(addprefix images/, c1.gif d3.gif dlogo.png dmlogo.gif			\
 gradient-green.jpg search-bg.gif Thumbs.db cpp1.gif d4.gif				\
 dmlogo-smaller.gif gradient-red.jpg search-button.gif d002.ico d5.gif	\
 globe.gif pen.gif search-left.gif)

diff --git a/module.dd b/module.dd
@@ -45,7 +45,7 @@ $(V2
 	Modules superficially resemble classes, but differ in that:
 	)
 
-	$(UL 
+	$(UL
 	$(LI There's only one instance of each module, and it is
 	statically allocated.)
 
@@ -240,7 +240,7 @@ void test()
 { foo();   // call B.foo()
   A.foo(); // call A.foo()
   B.foo(); // call B.foo()
-} 
+}
 ---
 
 <h3>Public Imports</h3>
@@ -467,7 +467,7 @@ $(GNAME MixinDeclaration):
 Macros:
 	TITLE=Modules
 	WIKI=Module
-	CATEGORY_SPEC=$0
+	CATEGORY_SPEC=$0
 	GLINK=$(LINK2 #$0, $(I $0))
 	GNAME=$(LNAME2 $0, $0)
 	FOO=

diff --git a/std.ddoc b/std.ddoc
@@ -71,20 +71,26 @@ function listanchors()
 </head>
 
 <body onload="listanchors()" class='hyphenate'>
-<div id="heading">
-	<a href="http://www.digitalmars.com/"><img src="../images/dmlogo.gif" width="270" height="53" border="0" alt="www.digitalmars.com" align="left"></a>
-	<p align="right">D Programming Language 2.0</p>
-
-	<div id="headingNav">
-	$(UL
-	$(LI <a href="http://www.prowiki.org/wiki4d/wiki.cgi?DocComments/$(WIKI)" title="Read/write comments and feedback">Comments</a>)
-	$(LI <a href="../index.html" title="D Programming Language" class="dlink">D</a>)
-	$(LI <a href="http://www.digitalmars.com/advancedsearch.html" title="Search Digital Mars web site">Search</a>)
-	$(LI <a href="http://www.digitalmars.com/" title="www.digitalmars.com">Home</a>)
-	)
+	<div id="top">
+		<form method="get" action="http://www.google.com/search">
+			<div id="search-box">
+				<img src="/images/search-left.gif" width="11" height="22" /><input id="q" name="q" /><input type="image" id="search-submit" name="submit" src="/images/search-button.gif" />
+				<input type="hidden" id="domains" name="domains" value="www.digitalmars.com" />
+				<input type="hidden" id="sourceid" name="sourceid" value="google-search" />
+				<div id="search-dropdown">
+					<select id="sitesearch" name="sitesearch" size="1">
+						<option value="www.digitalmars.com/d/$(VER)">Entire D $(VER) Site</option>
+						<option value="www.digitalmars.com/d/$(VER)/phobos">Library Reference</option>
+						<option value="www.digitalmars.com/d/archives">Newsgroup Archives</option>
+					</select>
 	</div>
+			</div>
+		</form>
 
-	<div id="lastupdate">Last update $(DATETIME)</div>
+		<div id="header">
+			<!--a href="/"><img id="logo" border="0" alt="D" src="/images/dlogo.png"></a-->
+			<div id="d-language"><a href="">D Programming Language $(VER)</a></div>
+		</div>
 </div>
 
 <div id="navigation">