diff --git a/README.md b/README.md index ae6961139..801ed84ce 100644 --- a/README.md +++ b/README.md @@ -355,9 +355,9 @@ All published portions are free for redistribution and/or modification under the [GNU General Public License](/LICENSE) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -You are required to include the following copyright notice, with a link to [http://pcjs.org](): +You are required to include the following copyright notice, with a link to [{{ site.pcjs_domain }}]({{ site.url }}): -> [PCjs](http://pcjs.org) © 2012-2015 by [Jeff Parsons](mailto:Jeff@pcjs.org) ([@jeffpar](http://twitter.com/jeffpar)) +> [PCjs]({{ site.url }}) © 2012-2015 by [Jeff Parsons](mailto:Jeff@pcjs.org) ([@jeffpar](http://twitter.com/jeffpar)) in every source code file of every copy or modified version of this work, and to display that notice on every web page or computer that runs any version of this software. diff --git a/_config.yml b/_config.yml index e186e4751..d7f2c0237 100644 --- a/_config.yml +++ b/_config.yml @@ -18,5 +18,5 @@ kramdown: hard_wrap: false # Custom site settings -pcjs_sitename: pcjs.net +pcjs_domain: pcjs.net pcjs_version: 1.20.1 diff --git a/_includes/footer.html b/_includes/footer.html index 6ffd535e9..53b6e2d17 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -10,6 +10,8 @@ + {% comment %} +
+ {% endcomment %} +

- pcjs.net website © 2012-2015 by @jeffpar
+ {{ site.pcjs_domain }} website © 2012-2015 by @{{ site.twitter_username }}
PCjs and C1Pjs released under GPL version 3 or later

diff --git a/_includes/head.html b/_includes/head.html index 5bb5f46d7..354b496c3 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -4,6 +4,7 @@ {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} + diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html index 17784b2f8..3c64d4e5c 100644 --- a/_includes/machine-engines.html +++ b/_includes/machine-engines.html @@ -1,10 +1,10 @@ {% for machine in page.machines %} - {% capture machine_embed %}window.embed{{ machine.type | upcase }}{% endcapture %} + {% capture machine_embed %}window.embed{{ machine.type | remove:'-dbg' | upcase }}{% endcapture %} {% if machine.config %}{% capture machine_config %}{{ machine.config }}{% endcapture %}{% else %}{% assign machine_config = "machine.xml" %}{% endif %} - {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine.type }}js/{{ site.pcjs_version }}/components.xsl{% endcapture %} + {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}/components.xsl{% endcapture %} {% capture machine_script %}/{{ machine.type }}.js{% endcapture %} {% unless machine_scripts contains machine_script %} - + {% endunless %} {% capture machine_scripts %}{{ machine_scripts }}{{ machine_script }}{% endcapture %} diff --git a/_includes/machine-styles.html b/_includes/machine-styles.html index 57c6a3d04..a841a2868 100644 --- a/_includes/machine-styles.html +++ b/_includes/machine-styles.html @@ -1,5 +1,5 @@ {% for machine in page.machines %} - {% capture machine_style %}{{ site.baseurl }}/versions/{{ machine.type }}js/{{ site.pcjs_version }}/components.css{% endcapture %} + {% capture machine_style %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}/components.css{% endcapture %} {% unless machine_styles contains machine_style %} {% endunless %} diff --git a/_sass/_base.scss b/_sass/_base.scss index 07ca82889..6134ef598 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -2,7 +2,7 @@ * Reset some basic elements */ body, h1, h2, h3, h4, h5, h6, -p, blockquote, pre, hr, +p, blockquote, pre, dl, dd, ol, ul, figure { margin: 0; padding: 0; @@ -111,9 +111,9 @@ blockquote { color: $grey-color; border-left: 4px solid $grey-color-light; padding-left: $spacing-unit / 2; - font-size: 18px; - letter-spacing: -1px; - font-style: italic; + /* font-size: 18px; */ + /* letter-spacing: -1px; */ + /* font-style: italic; */ > :last-child { margin-bottom: 0; diff --git a/_sass/_layout.scss b/_sass/_layout.scss index def56f896..e8dcda350 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -121,8 +121,8 @@ } .footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); + width: -webkit-calc(40% - (#{$spacing-unit} / 2)); + width: calc(40% - (#{$spacing-unit} / 2)); } .footer-col-2 { @@ -131,8 +131,8 @@ } .footer-col-3 { - width: -webkit-calc(45% - (#{$spacing-unit} / 2)); - width: calc(45% - (#{$spacing-unit} / 2)); + width: -webkit-calc(60% - (#{$spacing-unit} / 2)); + width: calc(60% - (#{$spacing-unit} / 2)); } @include media-query($on-laptop) { diff --git a/css/main.scss b/css/main.scss index f03d1c3da..321f4ffd3 100755 --- a/css/main.scss +++ b/css/main.scss @@ -3,10 +3,8 @@ --- @charset "utf-8"; - - // Our variables -$base-font-family: Helvetica, Arial, sans-serif; +$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; diff --git a/devices/README.md b/devices/README.md index 8031d5db0..862789700 100644 --- a/devices/README.md +++ b/devices/README.md @@ -1,3 +1,9 @@ +--- +layout: page +title: Machine Configurations +permalink: /devices/ +--- + Machine Configurations --- diff --git a/devices/c1p/README.md b/devices/c1p/README.md index 2332ada86..aa103d4f5 100644 --- a/devices/c1p/README.md +++ b/devices/c1p/README.md @@ -1,3 +1,9 @@ +--- +layout: page +title: Challenger 1P Machine Configurations +permalink: /devices/c1p/ +--- + Challenger 1P Configurations --- diff --git a/devices/c1p/machine/32kb/machine.md b/devices/c1p/machine/32kb/machine.md new file mode 100644 index 000000000..b8dce3c0e --- /dev/null +++ b/devices/c1p/machine/32kb/machine.md @@ -0,0 +1,10 @@ +--- +layout: page +title: "OSI Challenger 1P (32Kb) with Disk Support" +permalink: /devices/c1p/machine/32kb/ +machines: + - type: c1p-dbg + id: c1p32kb +--- + +{% include machine.html id="c1p32kb" %} diff --git a/devices/c1p/machine/README.md b/devices/c1p/machine/README.md index 4643b6afc..9a23551fe 100644 --- a/devices/c1p/machine/README.md +++ b/devices/c1p/machine/README.md @@ -1,3 +1,9 @@ +--- +layout: page +title: Machines +permalink: /devices/c1p/machine/ +--- + Challenger 1P Machine Configurations --- @@ -10,4 +16,4 @@ Here are some sample C1P Machine Configurations: * [8kb "Server Array" Demo](8kb/array/) * [32kb with Diskette Support](32kb/) -See the [Documentation](/docs/c1pjs/) for details on the operation of C1Pjs. \ No newline at end of file +See the [Documentation](/docs/c1pjs/) for details on the operation of C1Pjs. diff --git a/devices/pc/README.md b/devices/pc/README.md index e23df89eb..0fcff73c9 100644 --- a/devices/pc/README.md +++ b/devices/pc/README.md @@ -1,4 +1,10 @@ -IBM PC Configurations +--- +layout: page +title: PC Machine Configurations +permalink: /devices/pc/ +--- + +PC Machine Configurations --- This folder contains IBM PC [Machine Configurations](machine/), along with [Control Panels](/devices/pc/panel/), diff --git a/devices/pc/machine/5150/README.md b/devices/pc/machine/5150/README.md index 10415e88a..bba000552 100644 --- a/devices/pc/machine/5150/README.md +++ b/devices/pc/machine/5150/README.md @@ -1,4 +1,10 @@ -IBM PC (Model 5150) +--- +layout: page +title: IBM PC Machines (Model 5150) +permalink: /devices/pc/machine/5150/ --- -All our Model 5150 configurations of the IBM PC are located here. \ No newline at end of file +IBM PC Machines (Model 5150) +--- + +All our Model 5150 configurations of the IBM PC are located here. diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.md b/devices/pc/machine/5150/mda/64kb/debugger/machine.md new file mode 100644 index 000000000..cbade1018 --- /dev/null +++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.md @@ -0,0 +1,10 @@ +--- +layout: page +title: "PCjs | IBM PC (Model 5150) with Monochrome Display" +permalink: /devices/pc/machine/5150/mda/64kb/debugger/ +machines: + - type: pc-dbg + id: ibm5150 +--- + +{% include machine.html id="ibm5150" %} diff --git a/devices/pc/machine/5150/mda/64kb/machine.md b/devices/pc/machine/5150/mda/64kb/machine.md index 1b9f49058..15c7a983c 100644 --- a/devices/pc/machine/5150/mda/64kb/machine.md +++ b/devices/pc/machine/5150/mda/64kb/machine.md @@ -1,6 +1,6 @@ --- layout: page -title: "PCjs | IBM PC (Model 5150) with Monochrome Display" +title: "IBM PC (Model 5150) with Monochrome Display" permalink: /devices/pc/machine/5150/mda/64kb/ machines: - type: pc diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.md b/devices/pc/machine/5150/mda/64kb/softkbd/machine.md new file mode 100644 index 000000000..a720d6ad9 --- /dev/null +++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.md @@ -0,0 +1,10 @@ +--- +layout: page +title: "PCjs | IBM PC (Model 5150) with Monochrome Display" +permalink: /devices/pc/machine/5150/mda/64kb/softkbd/ +machines: + - type: pc-dbg + id: ibm5150 +--- + +{% include machine.html id="ibm5150" %} diff --git a/devices/pc/machine/5150/mda/README.md b/devices/pc/machine/5150/mda/README.md index 5edb240ed..b2feabbf3 100644 --- a/devices/pc/machine/5150/mda/README.md +++ b/devices/pc/machine/5150/mda/README.md @@ -1,3 +1,13 @@ +--- +layout: page +title: IBM PC Machines (Model 5150) with Monochrome (MDA) Display +permalink: /devices/pc/machine/5150/mda/ +machines: + - type: pc + id: ibm5150 + config: /devices/pc/machine/5150/mda/64kb/machine.xml +--- + IBM PC (Model 5150) with Monochrome (MDA) Display --- @@ -7,4 +17,4 @@ Below is a 64kb configuration, with a clock speed of 4.77Mhz, using the original IBM PC Model 5150 ROM BIOS and MDA font ROM. For more control, use this [alternate configuration](/devices/pc/machine/5150/mda/64kb/debugger/) with Control Panel and Debugger. -[IBM PC (Model 5150) with Monochrome Display and 64Kb](/devices/pc/machine/5150/mda/64kb/ "PCjs:ibm5150") +{% include machine.html id="ibm5150" %} diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md index 7d8051b26..38a002a48 100644 --- a/devices/pc/machine/README.md +++ b/devices/pc/machine/README.md @@ -1,3 +1,10 @@ +--- +layout: page +title: Machines +menu_order: 5 +permalink: /devices/pc/machine/ +--- + IBM PC Machine Configurations --- diff --git a/docs/about/README.md b/docs/about/README.md index b919a572e..e53d57848 100644 --- a/docs/about/README.md +++ b/docs/about/README.md @@ -9,7 +9,7 @@ permalink: /docs/about/ The JavaScript Machines Project (originally at [jsmachines.net](http://jsmachines.net/)) is a collection of computer simulations written in JavaScript. It has now been released on [GitHub](https://github.com/) as the -[PCjs Project](https://github.com/jeffpar/pcjs), a copy of which is hosted here at [pcjs.org](http://www.pcjs.org/). +[PCjs Project](https://github.com/jeffpar/pcjs), a copy of which is hosted here at [{{ site.pcjs_domain }}]({{ site.url }}). The goals of the project are to create fast, full-featured simulations of classic computer hardware, help people understand how these early machines worked, make it easy to experiment with different machine @@ -28,7 +28,7 @@ The first JavaScript Machines simulation was [C1Pjs](/docs/c1pjs/), a simulation Challenger 1P, which was a 6502-based microcomputer introduced by Ohio Scientific in 1978. C1Pjs v1.0 was released in July 2012, first on ecpsim.org and cpusim.org, then on [jsmachines.net](http://jsmachines.net/c1pjs), -and finally [pcjs.org](http://www.pcjs.org/). More information about the first release of C1Pjs was also +and finally [{{ site.pcjs_domain }}]({{ site.url }}). More information about the first release of C1Pjs was also [posted](http://osiweb.org/osiforum/viewtopic.php?f=3&t=103) on the [OSI Discussion Forum](http://osiweb.org/osiforum/index.php) at [osiweb.org](http://osiweb.org/). @@ -52,8 +52,8 @@ Read [About PCjs](/docs/about/pcjs/) to learn more about its history, features, ### Migrating to Node: The PCjs Project -The JavaScript Machines Project was migrated to a [Node.js](http://nodejs.org) web server ([pcjs.org](http://www.pcjs.org/)) -in 2014, and became the PCjs Project. +The JavaScript Machines Project was migrated to a [Node.js](http://nodejs.org) web server in 2014, and became the +PCjs Project. The goals included: @@ -75,9 +75,9 @@ All published portions are free for redistribution and/or modification under the [GNU General Public License](/LICENSE) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -You are required to include the following copyright notice, with a link to [http://pcjs.org](): +You are required to include the following copyright notice, with a link to [{{ site.pcjs_domain }}]({{ site.url }}): -> [PCjs](http://pcjs.org) © 2012-2015 by [Jeff Parsons](mailto:Jeff@pcjs.org) ([@jeffpar](http://twitter.com/jeffpar)) +> [PCjs]({{ site.url }}) © 2012-2015 by [Jeff Parsons](mailto:Jeff@pcjs.org) ([@jeffpar](http://twitter.com/jeffpar)) in every source code file of every copy or modified version of this work, and to display that notice on every web page or computer that runs any version of this software. diff --git a/docs/about/pcjs/README.md b/docs/about/pcjs/README.md index ba7a40be6..e92170b2b 100644 --- a/docs/about/pcjs/README.md +++ b/docs/about/pcjs/README.md @@ -1,3 +1,9 @@ +--- +layout: page +title: About PCjs +permalink: /docs/about/pcjs/ +--- + About PCjs --- diff --git a/modules/pcjs/templates/components.css b/modules/pcjs/templates/components.css index 9be76b1d7..36c3d0cf4 100644 --- a/modules/pcjs/templates/components.css +++ b/modules/pcjs/templates/components.css @@ -14,6 +14,9 @@ .pcjs-embed:after { clear:both; } +.pcjs-machine { + padding-bottom: 1em; +} .pcjs-name, .pcjs-menu { clear: both; font-weight: bold; diff --git a/versions/pcjs/1.20.1/components.css b/versions/pcjs/1.20.1/components.css index 48d6d6bb3..0a7e5894f 100644 --- a/versions/pcjs/1.20.1/components.css +++ b/versions/pcjs/1.20.1/components.css @@ -1,6 +1,5 @@ @CHARSET "UTF-8"; - *:not(input,textarea) { -webkit-user-select: none; } @@ -9,6 +8,9 @@ .pcjs-embed:after { clear:both; } +.pcjs-machine { + padding-bottom: 1em; +} .pcjs-name, .pcjs-menu { clear: both; font-weight: bold;