Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New logo #4306

Merged
merged 2 commits into from
Jul 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed app/javascript/images/background-photo.jpg
Binary file not shown.
Binary file removed app/javascript/images/boost_sprite.png
Binary file not shown.
Binary file removed app/javascript/images/fluffy-elephant-friend.png
Binary file not shown.
Binary file removed app/javascript/images/logo.png
Binary file not shown.
2 changes: 1 addition & 1 deletion app/javascript/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/javascript/images/logo_alt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/javascript/images/logo_full.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/javascript/images/mastodon.jpg
Binary file not shown.
9 changes: 8 additions & 1 deletion app/javascript/styles/about.scss
Original file line number Diff line number Diff line change
Expand Up @@ -505,12 +505,19 @@
a {
padding-left: 0;
color: $white;

&:hover img {
opacity: 1;
}
}

img {
width: 32px;
height: 32px;
margin-right: 10px;
position: relative;
top: 4px;
left: -10px;
opacity: 0.8;
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions app/javascript/styles/containers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
align-items: center;

img {
width: 32px;
height: 32px;
height: 42px;
margin-right: 10px;
}

Expand Down
3 changes: 1 addition & 2 deletions app/views/about/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
.container.links
.brand
= link_to root_url do
= image_tag asset_pack_path('logo.svg'), alt: '', role: 'presentation'
Mastodon
= image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'

%ul.nav
%li
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/admin.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.sidebar-wrapper
.sidebar
= link_to root_path do
= image_tag asset_pack_path('logo.png'), class: 'logo'
= image_tag asset_pack_path('logo.svg'), class: 'logo', alt: 'Mastodon'

= render_navigation
.content-wrapper
Expand Down
3 changes: 1 addition & 2 deletions app/views/layouts/auth.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
.logo-container
%h1
= link_to root_path do
= image_tag asset_pack_path('logo.svg')
Mastodon
= image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'

.form-container
= render 'flashes'
Expand Down
Binary file modified public/android-chrome-192x192.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 modified public/apple-touch-icon.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 modified public/badge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/browserconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#2b5797</TileColor>
<TileColor>#282c37</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file modified public/favicon-dev.ico
Binary file not shown.
Binary file modified public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion public/mask-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.