Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update

Browse Source

Conflicts:
	app/javascript/styles/win95.scss
	config/themes.yml

...

This commit is contained in:

David Yip

2018-01-18 10:54:12 -06:00

parent 708ec07e27 fe6663ef50

commit d3f64812a6

6 changed files with 186 additions and 73 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

app/javascript/images/clippy_frame.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 378 B

app/javascript/images/clippy_wave.gif

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.7 KiB

app/javascript/images/icon_follow_requests.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 561 B

app/javascript/images/icon_keyboard_shortcuts.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 384 B

app/javascript/images/icon_lists.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 437 B