Skip to content

Commit

Permalink
Hotfix: themes (#16)
Browse files Browse the repository at this point in the history
* Fix advanced interface column width

* Add icons for win95 theme

* Add mobile app icon

* Minor style adjustment
  • Loading branch information
umonaca authored and doubanius committed Nov 7, 2019
1 parent c49ebf2 commit 5b4e932
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 0 deletions.
Binary file added app/javascript/images/icon_dev.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 app/javascript/images/icon_mobile_app.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 app/javascript/images/icon_profile.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 app/javascript/images/icon_relationship.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 app/javascript/images/icon_setting_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/javascript/styles/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@
@import 'mastodon/dashboard';
@import 'mastodon/rtl';
@import 'mastodon/accessibility';

.column {
flex-grow: 1;
}
27 changes: 27 additions & 0 deletions app/javascript/styles/win95.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1401,6 +1401,12 @@ body.admin {
background-position: 36px 50%;
&:hover { background-image: url("../images/icon_local.png"); }
}
.column-link[href="/web/directory"] {
background-image: url("../images/icon_profile");
background-repeat:no-repeat;
background-position: 36px 50%;
&:hover { background-image: url("../images/icon_profile"); }
}
.column-link[href="/web/timelines/direct"] {
background-image: url("../images/icon_direct.png");
background-repeat:no-repeat;
Expand Down Expand Up @@ -1455,6 +1461,12 @@ body.admin {
background-position: 36px 50%;
&:hover { background-image: url("../images/icon_settings.png"); }
}
.column-link[href="/relationships"] {
background-image: url("../images/icon_relationship.png");
background-repeat:no-repeat;
background-position: 36px 50%;
&:hover { background-image: url("../images/icon_relationship.png"); }
}

.getting-started__footer ul li a[href="/web/keyboard-shortcuts"] {
background-image: url("../images/icon_keyboard_shortcuts.png");
Expand All @@ -1464,10 +1476,18 @@ body.admin {
background-image: url("../images/icon_invite.png");
&:hover { background-image: url("../images/icon_invite.png"); }
}
.getting-started__footer ul li a[href="/auth/edit"] {
background-image: url("../images/icon_setting_alt");
&:hover { background-image: url("../images/icon_setting_alt"); }
}
.getting-started__footer ul li a[href="/terms"] {
background-image: url("../images/icon_tos.png");
&:hover { background-image: url("../images/icon_tos.png"); }
}
.getting-started__footer ul li a[href="/settings/applications"] {
background-image: url("../images/icon_dev.png");
&:hover { background-image: url("../images/icon_dev.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"); }
Expand All @@ -1476,10 +1496,17 @@ body.admin {
background-image: url("../images/icon_about.png");
&:hover { background-image: url("../images/icon_about.png"); }
}
.getting-started__footer ul li a[href="https://joinmastodon.org/apps"] {
background-image: url("../images/icon_mobile_app.png");
&:hover { background-image: url("../images/icon_mobile_app.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"); }
}
.getting-started__footer > p {
margin-right: 30px;
}

.column .static-content.getting-started {
display:none;
Expand Down

0 comments on commit 5b4e932

Please sign in to comment.