Skip to content

Commit

Permalink
Update branding
Browse files Browse the repository at this point in the history
- Include ".js" in the title so it matches the 98.js.org domain and is a *little* meatier as opposed to the hyperminimalist "98" name, better for SEO probably, but also just less confusing when it comes to how you should refer to the project
- Use the Windows Update icon instead of the desktop icon as a logo/favicon
- Update the README etc.
- Add icons for all Related Projects, and stylize their names more consistently
  • Loading branch information
1j01 committed Apr 5, 2018
1 parent 80daa05 commit 3bd96f0
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 29 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Contributing

For Paint, open issues/PRs on [jspaint](https://github.com/1j01/jspaint) –
unless they specifically relate to the integration with 98,
unless they specifically relate to the integration with 98.js,
in which case making the changes here is fine!

Generally open an issue (or comment on an issue if there's one you're planning on working on)
Generally open an issue (or comment on an issue if there's one already)
before starting work on a PR, if you want the best chance of it being accepted.
(I just don't want to see wasted effort!)

Expand Down
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

# ![](images/icons/desktop-32x32.png) [98](https://98.js.org)
# ![](images/icons/windows-update-32x32.png) [98.js](https://98.js.org)

A web based Windows 98 desktop remake.

Includes:
* ![](images/icons/notepad-16x16.png) Notepad ([separate README](programs/notepad/README.md))
* ![](images/icons/speaker-16x16.png) Sound Recorder ([separate README](programs/sound-recorder/README.md))
* ![](images/icons/paint-16x16.png) Paint ([separate repository](https://github.com/1j01/jspaint))
* [![](images/icons/minesweeper-16x16.png) Minesweeper](https://github.com/ziebelje/minesweeper) by [Jon Ziebell](https://github.com/ziebelje/) ([separate README](programs/minesweeper/README.md))
* [![](images/icons/winamp2-16x16.png) Winamp2-js](https://github.com/captbaritone/winamp2-js) by [Jordan Eldredge](https://jordaneldredge.com/) ([separate README](programs/winamp/README.md))
* ![](images/icons/minesweeper-16x16.png) Minesweeper ([separate README](programs/minesweeper/README.md); [original repository](https://github.com/ziebelje/minesweeper)) by [Jon Ziebell](https://github.com/ziebelje/)
* ![](images/icons/winamp2-16x16.png) Winamp 2.9 ([separate README](programs/winamp/README.md); [original repository](https://github.com/captbaritone/winamp2-js)) by [Jordan Eldredge](https://jordaneldredge.com/)

## Try it out

Expand All @@ -18,17 +18,19 @@ Includes:

## Related Projects

* [![](images/icons/task-16x16.png) os-gui](https://github.com/1j01/os-gui), which is in the process of being extracted from this project

Apps that it would be nice to integrate:
* [![](images/icons/pipes-16x16.png) Pipes](https://github.com/1j01/pipes)
* [![](images/icons/solitaire-16x16.png) js-solitaire](https://github.com/uzi88/js-solitaire)
* [![](images/icons/settings-16x16.png) winclassic](https://github.com/tpenguinltg/winclassic) (theme designer)
* [![](images/icons/solitaire-16x16.png) JavaScript Solitaire Game](https://github.com/uzi88/js-solitaire)
* [![](images/icons/settings-16x16.png) Windows Classic theme designer](https://github.com/tpenguinltg/winclassic)

Other operating systems:
* [rahul.io](https://rahul.io/), another Windows 98 remake ([repo here](https://github.com/lolstring/window98-html-css-js))
* [Windows 93](https://www.windows93.net/), a "fictional version of Windows" (it's weird) (and good)
* [OS.js](https://www.os-js.org/), a more "legit" web desktop, but not a remake or... *vaporwave nostalgia destination*
* [![](images/start.png) Rahul.io](https://rahul.io/), another Windows 98 remake ([repo here](https://github.com/lolstring/window98-html-css-js))
* [![](images/icons/windows-93-16x16.png) Windows 93](https://www.windows93.net/), a "fictional version of Windows" (it's weird and good)
* [![](images/icons/os-js-16x16.png) OS.js](https://www.os-js.org/), a more "legit" web desktop, but... not a *vaporwave nostalgia destination* ([repo here](https://github.com/os-js/OS.js))

Libraries:
* [![](images/icons/task-16x16.png) OS GUI](https://github.com/1j01/os-gui), which is in the process of being extracted from this project
* [![](images/icons/folder-16x16.png) BrowserFS](https://github.com/jvilk/BrowserFS), a filesystem abstraction library powering 98.js

## Contributing

Expand Down
4 changes: 2 additions & 2 deletions desktop/CREDITS.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Hello! Welcome to 98.
Hello! Welcome to 98.js
https://github.com/1j01/98

--------------------------------------
Expand All @@ -11,7 +11,7 @@ Minesweeper by Jon Ziebell
Winamp2-js by Jordan Eldredge
https://github.com/captbaritone/winamp2-js

Paint, Sound Recorder, Notepad, and the 98 desktop by Isaiah Odhner
Paint, Sound Recorder, Notepad, and the 98.js desktop by Isaiah Odhner
https://github.com/1j01/98
https://github.com/1j01/jspaint

Expand Down
Binary file added images/icons/os-js-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/os-js-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/os-js-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/windows-93-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/windows-93-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/windows-93-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8">
<title>Windows 98</title>
<title>98.js - Windows 98 Online</title>
<link href="layout.css" rel="stylesheet" type="text/css">
<link href="classic.css" rel="stylesheet" type="text/css">
<link rel="icon" href="images/icons/desktop-16x16.png" sizes="16x16" type="image/png">
<link rel="icon" href="images/icons/desktop-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="images/icons/desktop-48x48.png" sizes="48x48" type="image/png">
<link rel="icon" href="images/icons/windows-update-16x16.png" sizes="16x16" type="image/png">
<link rel="icon" href="images/icons/windows-update-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="images/icons/windows-update-48x48.png" sizes="48x48" type="image/png">
<meta name="viewport" content="width=device-width, user-scalable=no">
</head>
<body>
Expand Down
9 changes: 5 additions & 4 deletions manifest.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "Windows 98",
"name": "98.js - Windows 98 Online",
"short_name": "98.js",
"version": "0.1.3",
"description": "Windows 98 retro remake",
"icons": {
"16": "images/icons/desktop-16x16.png",
"32": "images/icons/desktop-32x32.png",
"48": "images/icons/desktop-48x48.png"
"16": "images/icons/windows-update-16x16.png",
"32": "images/icons/windows-update-32x32.png",
"48": "images/icons/windows-update-48x48.png"
},
"permissions": [
"fullscreen",
Expand Down
9 changes: 5 additions & 4 deletions manifest.webapp
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "Windows 98",
"name": "98.js - Windows 98 Online",
"short_name": "98.js",
"version": "0.1.3",
"description": "Windows 98 retro remake",
"icons": {
"16": "98.js.org/images/icons/desktop-16x16.png",
"32": "98.js.org/images/icons/desktop-32x32.png",
"48": "98.js.org/images/icons/desktop-48x48.png"
"16": "98.js.org/images/icons/windows-update-16x16.png",
"32": "98.js.org/images/icons/windows-update-32x32.png",
"48": "98.js.org/images/icons/windows-update-48x48.png"
},
"permissions": {},
"developer": {
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
"browser",
"windows",
"98",
"98.js",
"windows-98",
"operating-system",
"os"
"os",
"js",
"javascript"
],
"devDependencies": {
"browserfs": "^1.4.3",
Expand Down
4 changes: 2 additions & 2 deletions programs/winamp/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# ![](../../images/icons/winamp2-32x32.png) Winamp 2
# ![](../../images/icons/winamp2-32x32.png) Winamp 2.9

[Winamp2-js](https://github.com/captbaritone/winamp2-js) by [Jordan Eldredge](https://jordaneldredge.com/)

Expand All @@ -13,6 +13,6 @@ Try it [on 98.js.org](http://98.js.org/) or [standalone at webamp.org](http://we

* Window blurring (also needed for regular windows!)

* Localize keyboard shortcuts (currently pretty much everything in 98 is in iframes, and I haven't implemented arrow keys for icons on the desktop, so it's hard to tell, and it doesn't matter much, but the keyboard shortcuts should only apply when Winamp is focused - so this depends on window blurring)
* Localize keyboard shortcuts (currently pretty much everything in 98.js uses iframes, and I haven't implemented arrow keys for icons on the desktop, so it's hard to tell, and it doesn't matter much (yet), but the keyboard shortcuts should only apply when Winamp is focused - so this depends on window blurring)

* Interop with Sound Recorder should be fun! ;)

0 comments on commit 3bd96f0

Please sign in to comment.