about summary refs log tree commit diff
path: root/app/javascript/images
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-18 10:54:12 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-18 10:54:12 -0600
commitd3f64812a695788cda5d168ff10c666ffbdab339 (patch)
tree1f6876a3588af04f454686134ac1bd6a12a019e2 /app/javascript/images
parent708ec07e27dd02d03f2d155bcc61ae8de4c10c4a (diff)
parentfe6663ef504f5c8541e05c92bfd08c6a466b1a67 (diff)
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
 Conflicts:
	app/javascript/styles/win95.scss
	config/themes.yml
Diffstat (limited to 'app/javascript/images')
-rw-r--r--app/javascript/images/clippy_frame.pngbin0 -> 378 bytes
-rw-r--r--app/javascript/images/clippy_wave.gifbin0 -> 8897 bytes
-rw-r--r--app/javascript/images/icon_follow_requests.pngbin0 -> 561 bytes
-rw-r--r--app/javascript/images/icon_keyboard_shortcuts.pngbin0 -> 384 bytes
-rw-r--r--app/javascript/images/icon_lists.pngbin0 -> 437 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/images/clippy_frame.png b/app/javascript/images/clippy_frame.png
new file mode 100644
index 000000000..7f2cd6a59
--- /dev/null
+++ b/app/javascript/images/clippy_frame.png
Binary files differdiff --git a/app/javascript/images/clippy_wave.gif b/app/javascript/images/clippy_wave.gif
new file mode 100644
index 000000000..4d2e38a3d
--- /dev/null
+++ b/app/javascript/images/clippy_wave.gif
Binary files differdiff --git a/app/javascript/images/icon_follow_requests.png b/app/javascript/images/icon_follow_requests.png
new file mode 100644
index 000000000..4123e2a69
--- /dev/null
+++ b/app/javascript/images/icon_follow_requests.png
Binary files differdiff --git a/app/javascript/images/icon_keyboard_shortcuts.png b/app/javascript/images/icon_keyboard_shortcuts.png
new file mode 100644
index 000000000..d66f3939e
--- /dev/null
+++ b/app/javascript/images/icon_keyboard_shortcuts.png
Binary files differdiff --git a/app/javascript/images/icon_lists.png b/app/javascript/images/icon_lists.png
new file mode 100644
index 000000000..3828946e8
--- /dev/null
+++ b/app/javascript/images/icon_lists.png
Binary files differ