diff --git a/app/javascript/images/background-cybre-light.png b/app/javascript/images/background-cybre-light.png
deleted file mode 100644
index 44d76c24c..000000000
Binary files a/app/javascript/images/background-cybre-light.png and /dev/null differ
diff --git a/app/javascript/images/background-cybre.png b/app/javascript/images/cybre/background-cybre.png
similarity index 100%
rename from app/javascript/images/background-cybre.png
rename to app/javascript/images/cybre/background-cybre.png
diff --git a/app/javascript/images/header-cybre-colour.jpg b/app/javascript/images/cybre/header-cybre-colour.jpg
similarity index 100%
rename from app/javascript/images/header-cybre-colour.jpg
rename to app/javascript/images/cybre/header-cybre-colour.jpg
diff --git a/app/javascript/images/logo-cybre.png b/app/javascript/images/cybre/logo-cybre.png
similarity index 100%
rename from app/javascript/images/logo-cybre.png
rename to app/javascript/images/cybre/logo-cybre.png
diff --git a/app/javascript/images/floppy-1.svg b/app/javascript/images/floppy-1.svg
deleted file mode 100644
index 08c1e4a6c..000000000
--- a/app/javascript/images/floppy-1.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-
diff --git a/app/javascript/images/floppy-2.svg b/app/javascript/images/floppy-2.svg
deleted file mode 100644
index d57a72a72..000000000
--- a/app/javascript/images/floppy-2.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-
diff --git a/app/javascript/images/floppy-3.svg b/app/javascript/images/floppy-3.svg
deleted file mode 100644
index 2fe8ef399..000000000
--- a/app/javascript/images/floppy-3.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-
diff --git a/app/javascript/images/header-cybre-alt.jpg b/app/javascript/images/header-cybre-alt.jpg
deleted file mode 100644
index 4d2b6b3a8..000000000
Binary files a/app/javascript/images/header-cybre-alt.jpg and /dev/null differ
diff --git a/app/javascript/images/header-cybre.jpeg b/app/javascript/images/header-cybre.jpeg
deleted file mode 100644
index e9d7b336f..000000000
Binary files a/app/javascript/images/header-cybre.jpeg and /dev/null differ
diff --git a/app/javascript/images/logo-cybre-light.png b/app/javascript/images/logo-cybre-light.png
deleted file mode 100644
index 91908f6d3..000000000
Binary files a/app/javascript/images/logo-cybre-light.png and /dev/null differ
diff --git a/app/javascript/images/swan-lake.jpg b/app/javascript/images/swan-lake/swan-lake.jpg
similarity index 100%
rename from app/javascript/images/swan-lake.jpg
rename to app/javascript/images/swan-lake/swan-lake.jpg
diff --git a/app/javascript/images/alert_badge.png b/app/javascript/images/win95/alert_badge.png
similarity index 100%
rename from app/javascript/images/alert_badge.png
rename to app/javascript/images/win95/alert_badge.png
diff --git a/app/javascript/images/clippy_frame.png b/app/javascript/images/win95/clippy_frame.png
similarity index 100%
rename from app/javascript/images/clippy_frame.png
rename to app/javascript/images/win95/clippy_frame.png
diff --git a/app/javascript/images/clippy_wave.gif b/app/javascript/images/win95/clippy_wave.gif
similarity index 100%
rename from app/javascript/images/clippy_wave.gif
rename to app/javascript/images/win95/clippy_wave.gif
diff --git a/app/javascript/images/icon_about.png b/app/javascript/images/win95/icon_about.png
similarity index 100%
rename from app/javascript/images/icon_about.png
rename to app/javascript/images/win95/icon_about.png
diff --git a/app/javascript/images/icon_blocks.png b/app/javascript/images/win95/icon_blocks.png
similarity index 100%
rename from app/javascript/images/icon_blocks.png
rename to app/javascript/images/win95/icon_blocks.png
diff --git a/app/javascript/images/icon_direct.png b/app/javascript/images/win95/icon_direct.png
similarity index 100%
rename from app/javascript/images/icon_direct.png
rename to app/javascript/images/win95/icon_direct.png
diff --git a/app/javascript/images/icon_docs.png b/app/javascript/images/win95/icon_docs.png
similarity index 100%
rename from app/javascript/images/icon_docs.png
rename to app/javascript/images/win95/icon_docs.png
diff --git a/app/javascript/images/icon_domain_blocks.png b/app/javascript/images/win95/icon_domain_blocks.png
similarity index 100%
rename from app/javascript/images/icon_domain_blocks.png
rename to app/javascript/images/win95/icon_domain_blocks.png
diff --git a/app/javascript/images/icon_follow_requests.png b/app/javascript/images/win95/icon_follow_requests.png
similarity index 100%
rename from app/javascript/images/icon_follow_requests.png
rename to app/javascript/images/win95/icon_follow_requests.png
diff --git a/app/javascript/images/icon_home.png b/app/javascript/images/win95/icon_home.png
similarity index 100%
rename from app/javascript/images/icon_home.png
rename to app/javascript/images/win95/icon_home.png
diff --git a/app/javascript/images/icon_invite.png b/app/javascript/images/win95/icon_invite.png
similarity index 100%
rename from app/javascript/images/icon_invite.png
rename to app/javascript/images/win95/icon_invite.png
diff --git a/app/javascript/images/icon_keyboard_shortcuts.png b/app/javascript/images/win95/icon_keyboard_shortcuts.png
similarity index 100%
rename from app/javascript/images/icon_keyboard_shortcuts.png
rename to app/javascript/images/win95/icon_keyboard_shortcuts.png
diff --git a/app/javascript/images/icon_likes.png b/app/javascript/images/win95/icon_likes.png
similarity index 100%
rename from app/javascript/images/icon_likes.png
rename to app/javascript/images/win95/icon_likes.png
diff --git a/app/javascript/images/icon_lists.png b/app/javascript/images/win95/icon_lists.png
similarity index 100%
rename from app/javascript/images/icon_lists.png
rename to app/javascript/images/win95/icon_lists.png
diff --git a/app/javascript/images/icon_local.png b/app/javascript/images/win95/icon_local.png
similarity index 100%
rename from app/javascript/images/icon_local.png
rename to app/javascript/images/win95/icon_local.png
diff --git a/app/javascript/images/icon_logout.png b/app/javascript/images/win95/icon_logout.png
similarity index 100%
rename from app/javascript/images/icon_logout.png
rename to app/javascript/images/win95/icon_logout.png
diff --git a/app/javascript/images/icon_mutes.png b/app/javascript/images/win95/icon_mutes.png
similarity index 100%
rename from app/javascript/images/icon_mutes.png
rename to app/javascript/images/win95/icon_mutes.png
diff --git a/app/javascript/images/icon_notifications.png b/app/javascript/images/win95/icon_notifications.png
similarity index 100%
rename from app/javascript/images/icon_notifications.png
rename to app/javascript/images/win95/icon_notifications.png
diff --git a/app/javascript/images/icon_pin.png b/app/javascript/images/win95/icon_pin.png
similarity index 100%
rename from app/javascript/images/icon_pin.png
rename to app/javascript/images/win95/icon_pin.png
diff --git a/app/javascript/images/icon_public.png b/app/javascript/images/win95/icon_public.png
similarity index 100%
rename from app/javascript/images/icon_public.png
rename to app/javascript/images/win95/icon_public.png
diff --git a/app/javascript/images/icon_settings.png b/app/javascript/images/win95/icon_settings.png
similarity index 100%
rename from app/javascript/images/icon_settings.png
rename to app/javascript/images/win95/icon_settings.png
diff --git a/app/javascript/images/icon_tos.png b/app/javascript/images/win95/icon_tos.png
similarity index 100%
rename from app/javascript/images/icon_tos.png
rename to app/javascript/images/win95/icon_tos.png
diff --git a/app/javascript/images/start.png b/app/javascript/images/win95/start.png
similarity index 100%
rename from app/javascript/images/start.png
rename to app/javascript/images/win95/start.png
diff --git a/app/javascript/styles/cybre.scss b/app/javascript/styles/cybre.scss
index 972eb5d0b..b6b802263 100644
--- a/app/javascript/styles/cybre.scss
+++ b/app/javascript/styles/cybre.scss
@@ -21,13 +21,13 @@ $about-page-text: lighten($ui-base-color, 50%);
}
body, body.about-body {
- background: $ui-base-color url('../images/background-cybre.png');
+ background: $ui-base-color url('../images/cybre/background-cybre.png');
background-attachment: fixed;
}
body.about-body {
// basics.scss &.about-body
- background: darken($ui-base-color, 8%) url('../images/background-cybre.png');
+ background: darken($ui-base-color, 8%) url('../images/cybre/background-cybre.png');
background-position-y: 200px;
background-position-x: center;
@@ -63,14 +63,14 @@ body.about-body {
}
.column .static-content.getting-started {
- background-image: url('../images/logo-cybre.png'), url('../images/background-cybre.png');
+ background-image: url('../images/cybre/logo-cybre.png'), url('../images/cybre/background-cybre.png');
background-size:auto 50%, cover;
background-position: 50% 75%, center center;
background-repeat:no-repeat, no-repeat;
}
.columns-area {
- background: $ui-base-color url('../images/background-cybre.png');
+ background: $ui-base-color url('../images/cybre/background-cybre.png');
}
.actions .button.button-alternative {
@@ -91,7 +91,7 @@ body.about-body {
}
.landing-page.alternative .header {
- background-image:url('../images/header-cybre-colour.jpg');
+ background-image:url('../images/cybre/header-cybre-colour.jpg');
background-repeat: repeat-x;
background-size:contain;
height:45vh;
diff --git a/app/javascript/styles/swan-lake.scss b/app/javascript/styles/swan-lake.scss
index 9008969a6..63549b45b 100644
--- a/app/javascript/styles/swan-lake.scss
+++ b/app/javascript/styles/swan-lake.scss
@@ -276,7 +276,7 @@ $about-page-text: lighten($ui-base-color, 50%);
}
body, .landing-page, .public-layout {
- background-image: url("../images/swan-lake.jpg");
+ background-image: url("../images/swan-lake/swan-lake.jpg");
background-size: cover;
background-repeat: no-repeat;
background-position: center;
diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss
index 27bb065e8..0da5336bc 100644
--- a/app/javascript/styles/win95.scss
+++ b/app/javascript/styles/win95.scss
@@ -154,7 +154,7 @@ body.admin {
font-size:0px;
color:$win95-bg;
- background-image: url("../images/start.png");
+ background-image: url("../images/win95/start.png");
background-repeat:no-repeat;
background-position:8%;
background-clip:padding-box;
@@ -176,7 +176,7 @@ body.admin {
left:15px;
width:132px;
height:117px;
- background-image:url("../images/clippy_wave.gif"), url("../images/clippy_frame.png");
+ background-image:url("../images/win95/clippy_wave.gif"), url("../images/win95/clippy_frame.png");
background-repeat:no-repeat;
background-position: 4px 20px, 0px 0px;
z-index:0;
@@ -817,7 +817,7 @@ body.admin {
font-size:0px;
color:$win95-bg;
- background-image: url("../images/start.png");
+ background-image: url("../images/win95/start.png");
background-repeat:no-repeat;
background-position:8%;
background-clip:padding-box;
@@ -1160,7 +1160,7 @@ body.admin {
}
.column-link__badge {
- background-image: url('../images/alert_badge.png');
+ background-image: url('../images/win95/alert_badge.png');
background-repeat: no-repeat;
background-size:contain;
background-color:transparent;
@@ -1378,81 +1378,81 @@ body.admin {
}
.column-link[href="/web/timelines/home"] {
- background-image: url("../images/icon_home.png");
- &:hover { background-image: url("../images/icon_home.png"); }
+ background-image: url("../images/win95/icon_home.png");
+ &:hover { background-image: url("../images/win95/icon_home.png"); }
}
.column-link[href="/web/notifications"] {
- background-image: url("../images/icon_notifications.png");
- &:hover { background-image: url("../images/icon_notifications.png"); }
+ background-image: url("../images/win95/icon_notifications.png");
+ &:hover { background-image: url("../images/win95/icon_notifications.png"); }
}
.column-link[href="/web/timelines/public"] {
- background-image: url("../images/icon_public.png");
- &:hover { background-image: url("../images/icon_public.png"); }
+ background-image: url("../images/win95/icon_public.png");
+ &:hover { background-image: url("../images/win95/icon_public.png"); }
}
.column-link[href="/web/timelines/public/local"] {
- background-image: url("../images/icon_local.png");
- &:hover { background-image: url("../images/icon_local.png"); }
+ background-image: url("../images/win95/icon_local.png");
+ &:hover { background-image: url("../images/win95/icon_local.png"); }
}
.column-link[href="/web/timelines/direct"] {
- background-image: url("../images/icon_direct.png");
- &:hover { background-image: url("../images/icon_direct.png"); }
+ background-image: url("../images/win95/icon_direct.png");
+ &:hover { background-image: url("../images/win95/icon_direct.png"); }
}
.column-link[href="/web/pinned"] {
- background-image: url("../images/icon_pin.png");
- &:hover { background-image: url("../images/icon_pin.png"); }
+ background-image: url("../images/win95/icon_pin.png");
+ &:hover { background-image: url("../images/win95/icon_pin.png"); }
}
.column-link[href="/web/favourites"] {
- background-image: url("../images/icon_likes.png");
- &:hover { background-image: url("../images/icon_likes.png"); }
+ background-image: url("../images/win95/icon_likes.png");
+ &:hover { background-image: url("../images/win95/icon_likes.png"); }
}
.column-link[href="/web/lists"] {
- background-image: url("../images/icon_lists.png");
- &:hover { background-image: url("../images/icon_lists.png"); }
+ background-image: url("../images/win95/icon_lists.png");
+ &:hover { background-image: url("../images/win95/icon_lists.png"); }
}
.column-link[href="/web/follow_requests"] {
- background-image: url("../images/icon_follow_requests.png");
- &:hover { background-image: url("../images/icon_follow_requests.png"); }
+ background-image: url("../images/win95/icon_follow_requests.png");
+ &:hover { background-image: url("../images/win95/icon_follow_requests.png"); }
}
.column-link[href="/web/blocks"] {
- background-image: url("../images/icon_blocks.png");
- &:hover { background-image: url("../images/icon_blocks.png"); }
+ background-image: url("../images/win95/icon_blocks.png");
+ &:hover { background-image: url("../images/win95/icon_blocks.png"); }
}
.column-link[href="/web/domain_blocks"] {
- background-image: url("../images/icon_domain_blocks.png");
- &:hover { background-image: url("../images/icon_domain_blocks.png"); }
+ background-image: url("../images/win95/icon_domain_blocks.png");
+ &:hover { background-image: url("../images/win95/icon_domain_blocks.png"); }
}
.column-link[href="/web/mutes"] {
- background-image: url("../images/icon_mutes.png");
- &:hover { background-image: url("../images/icon_mutes.png"); }
+ background-image: url("../images/win95/icon_mutes.png");
+ &:hover { background-image: url("../images/win95/icon_mutes.png"); }
}
.column-link[href="/settings/preferences"] {
- background-image: url("../images/icon_settings.png");
- &:hover { background-image: url("../images/icon_settings.png"); }
+ background-image: url("../images/win95/icon_settings.png");
+ &:hover { background-image: url("../images/win95/icon_settings.png"); }
}
.getting-started__footer ul li a[href="/web/keyboard-shortcuts"] {
- background-image: url("../images/icon_keyboard_shortcuts.png");
- &:hover { background-image: url("../images/icon_keyboard_shortcuts.png"); }
+ background-image: url("../images/win95/icon_keyboard_shortcuts.png");
+ &:hover { background-image: url("../images/win95/icon_keyboard_shortcuts.png"); }
}
.getting-started__footer ul li a[href="/invites"] {
- background-image: url("../images/icon_invite.png");
- &:hover { background-image: url("../images/icon_invite.png"); }
+ background-image: url("../images/win95/icon_invite.png");
+ &:hover { background-image: url("../images/win95/icon_invite.png"); }
}
.getting-started__footer ul li a[href="/terms"] {
- background-image: url("../images/icon_tos.png");
- &:hover { background-image: url("../images/icon_tos.png"); }
+ background-image: url("../images/win95/icon_tos.png");
+ &:hover { background-image: url("../images/win95/icon_tos.png"); }
}
.getting-started__footer ul li a[href="https://docs.joinmastodon.org"] {
- background-image: url("../images/icon_docs.png");
- &:hover { background-image: url("../images/icon_docs.png"); }
+ background-image: url("../images/win95/icon_docs.png");
+ &:hover { background-image: url("../images/win95/icon_docs.png"); }
}
.getting-started__footer ul li a[href="/about/more"] {
- background-image: url("../images/icon_about.png");
- &:hover { background-image: url("../images/icon_about.png"); }
+ background-image: url("../images/win95/icon_about.png");
+ &:hover { background-image: url("../images/win95/icon_about.png"); }
}
.getting-started__footer ul li a[href="/auth/sign_out"] {
- background-image: url("../images/icon_logout.png");
- &:hover { background-image: url("../images/icon_logout.png"); }
+ background-image: url("../images/win95/icon_logout.png");
+ &:hover { background-image: url("../images/win95/icon_logout.png"); }
}
.column .static-content.getting-started {