Merge branch 'master' into gh-pages

.gitignore

@@ -7,6 +7,7 @@
 *.log
 *.dump
 *.heapsnapshot
+index.html
 .DS_Store
 .buildpath
 .idea

css/main.scss

@@ -1,47 +0,0 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
-@charset "utf-8";
-
-// Our variables
-$base-font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-$base-font-size:   16px;
-$small-font-size:  $base-font-size * 0.875;
-$base-line-height: 1.5;
-
-$spacing-unit:     30px;
-
-$text-color:       #111;
-$background-color: #fdfdfd;
-$brand-color:      #2a7ae2;
-
-$grey-color:       #828282;
-$grey-color-light: lighten($grey-color, 40%);
-$grey-color-dark:  darken($grey-color, 25%);
-
-$on-palm:          600px;
-$on-laptop:        800px;
-
-
-
-// Using media queries with like this:
-// @include media-query($palm) {
-//     .wrapper {
-//         padding-right: $spacing-unit / 2;
-//         padding-left: $spacing-unit / 2;
-//     }
-// }
-@mixin media-query($device) {
-    @media screen and (max-width: $device) {
-        @content;
-    }
-}
-
-
-
-// Import partials from `sass_dir` (defaults to `_sass`)
-@import
-        "base",
-        "layout",
-        "syntax-highlighting"
-;

modules/shared/templates/common.html

@@ -33,10 +33,9 @@
 						<li><a href="/">PCjs</a></li>
 						<li><a href="/apps/pcx86/">Demos</a></li>
 						<li><a href="/devices/">Devices</a></li>
-						<li><a href="/disks/pcx86/">Disks</a></li>
+						<li><a href="/disks/">Disks</a></li>
 						<li><a href="/docs/">Docs</a></li>
 						<li><a href="/pubs/">Pubs</a></li>
-						<li><a href="/blog/">Blog</a></li>
 						<li><a href="/docs/about/">About</a></li>
 					</ul>
 				</div>

modules/shared/templates/common.xsl

@@ -35,10 +35,9 @@
 					<li><a href="/">PCjs</a></li>
 					<li><a href="/apps/pcx86/">Demos</a></li>
 					<li><a href="/devices/">Devices</a></li>
-					<li><a href="/disks/pcx86/">Disks</a></li>
+					<li><a href="/disks/">Disks</a></li>
 					<li><a href="/docs/">Docs</a></li>
 					<li><a href="/pubs/">Pubs</a></li>
-					<li><a href="/blog/">Blog</a></li>
 					<li><a href="/docs/about/">About</a></li>
 				</ul>
 			</div>