From 956c4506c15ddb94316549ea2c3cba759cb8715f Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Mon, 14 Dec 2015 09:33:28 -0800 Subject: [PATCH] Improved screenshot styling --- README.md | 16 ++++++++-------- _includes/screenshot.html | 8 ++++++++ .../2014-09-02-minor-fixes-and-additions.md | 8 ++++---- _sass/_base.scss | 19 +++++++++++++++++++ notes.md | 8 +++++++- 5 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 _includes/screenshot.html diff --git a/README.md b/README.md index c987ccc14..d9e41fe61 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,14 @@ Demos --- Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows 1.01, and assorted non-DOS software. -[IBM PC running DONKEY.BAS](/devices/pc/machine/5150/cga/64kb/donkey/) -[IBM PC XT w/CGA, 10Mb Hard Drive](/devices/pc/machine/5160/cga/256kb/demo/) -[IBM PC XT w/CGA, Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/) -[IBM PC XT w/EGA, Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/) -[IBM PC AT w/EGA, OS/2 1.0](/disks/pc/os2/ibm/1.0/) -[IBM PC w/MDA, CP/M-86](/disks/pc/cpm/1.1b/) -[IBM PC w/MDA, Microsoft Adventure](/disks/pc/games/microsoft/adventure/) -[IBM PC w/CGA, Zork I](/disks/pc/games/infocom/zork1/) +{% include screenshot.html src="/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg" width="200" height="100" title="IBM PC running DONKEY.BAS" link="/devices/pc/machine/5150/cga/64kb/donkey/" %} +{% include screenshot.html src="/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg" width="200" height="100" title="IBM PC XT w/CGA, 10Mb Hard Drive" link="/devices/pc/machine/5160/cga/256kb/demo/" %} +{% include screenshot.html src="/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg" width="200" height="100" title="IBM PC XT w/CGA, Windows 1.01" link="/devices/pc/machine/5160/cga/256kb/win101/" %} +{% include screenshot.html src="/devices/pc/machine/5160/ega/640kb/win101/thumbnail.jpg" width="200" height="100" title="IBM PC XT w/EGA, Windows 1.01" link="/devices/pc/machine/5160/ega/640kb/win101/" %} +{% include screenshot.html src="/disks/pc/os2/ibm/1.0/thumbnail.jpg" width="200" height="100" title="IBM PC AT w/EGA, OS/2 1.0" link="/disks/pc/os2/ibm/1.0/" %} +{% include screenshot.html src="/disks/pc/cpm/1.1b/thumbnail.jpg" width="200" height="100" title="IBM PC w/MDA, CP/M-86" link="/disks/pc/cpm/1.1b/" %} +{% include screenshot.html src="/disks/pc/games/microsoft/adventure/thumbnail.jpg" width="200" height="100" title="IBM PC w/MDA, Microsoft Adventure" link="/disks/pc/games/microsoft/adventure/" %} +{% include screenshot.html src="/disks/pc/games/infocom/zork1/thumbnail.jpg" width="200" height="100" title="IBM PC w/CGA, Zork I" link="/disks/pc/games/infocom/zork1/" %} Check out the rest of the PCjs [Application](/apps/pc/), [Boot Disk](/disks/pc/) and [Machine](/devices/pc/machine/) demos, including an [IBM PC Dual Display System](/devices/pc/machine/5150/dual/64kb/) demo of multiple monitor support, diff --git a/_includes/screenshot.html b/_includes/screenshot.html new file mode 100644 index 000000000..a1e9689ff --- /dev/null +++ b/_includes/screenshot.html @@ -0,0 +1,8 @@ +
+
+ + {{ include.title }} + +
+ {{ include.title }} +
diff --git a/_posts/2014-09-02-minor-fixes-and-additions.md b/_posts/2014-09-02-minor-fixes-and-additions.md index b92fb52d7..4516ee8cf 100644 --- a/_posts/2014-09-02-minor-fixes-and-additions.md +++ b/_posts/2014-09-02-minor-fixes-and-additions.md @@ -6,8 +6,8 @@ category: Releases permalink: /blog/2014/09/02/ --- -The following fixes were made in PCjs v1.15.1: - +The following fixes were made in PCjs v1.15.1 + 1. Using the "User-defined URL" option when loading a disk image from a 3rd-party server was broken if the URL contained certain special characters; that should be fixed now, but be aware that only web servers (ie, URLs using the HTTP protocol) are supported. URLs that trigger a redirect may also not work (more testing required). @@ -19,7 +19,7 @@ and shutdown process: or *true* to re-enable; + *sendEvent(string)*: pass *"init"*, *"show"* or *"exit"* to simulate the corresponding browser event (*onload*, *onpageshow* or *onbeforeunload*, respectively). - + If a page calls *enableEvents(false)* before calling *embedPC()*, all machine layouts will be instantiated but the machines themselves will not be initialized. When the page is ready, call *enableEvents(true)* to restore normal event processing, and if the browser has already sent the *onload* event, then call *sendEvent("init")* @@ -27,6 +27,6 @@ to manually initialize the machine(s). These two new functions are designed to assist in testing the starting up, shutting down and restarting of machines, by allowing scripts to control the overall process, without requiring use of the browser's back/forward/close controls. - + *[@jeffpar](http://twitter.com/jeffpar)* *September 2, 2014* diff --git a/_sass/_base.scss b/_sass/_base.scss index 6134ef598..d941242f2 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -202,3 +202,22 @@ pre { } } } + + +/** + * Screenshot links + */ +.screenshot-frame { + display: inline-block; + margin: 8px; + text-align: center; +} +.screenshot-image { + padding: 5px; + border: 1px solid black; + border-radius: 5px; + background-color: #FAEBD7; +} +.screenshot-label { + font-size: x-small; +} diff --git a/notes.md b/notes.md index 98ab3b9b9..52ce3a8b7 100644 --- a/notes.md +++ b/notes.md @@ -158,6 +158,12 @@ Although I created image.html in the **_includes** folder, so that I could do th instead of this: - [](/devices/pc/machine/5150/cga/64kb/donkey/ "IBM PC running DONKEY.BAS") + [](/devices/pc/machine/5150/cga/64kb/donkey/ "IBM PC running DONKEY.BAS") I decided to stick with the latter, since it has a better chance of rendering as normal Markdown. + +Technically, the URLs in the latter should include: + + {{ site.baseurl }} + +but since I'm using a custom domain name (http://pcjs.net instead of http://jeffpar.github.io/pcjs), it's not necessary.