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.

Sign up for GitHub

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

Jump to bottom

v1.5で追加されたマストドンの横長ロゴをアイマストドン仕様にする #52

Merged
merged 2 commits into from
Aug 20, 2017
Merged

v1.5で追加されたマストドンの横長ロゴをアイマストドン仕様にする #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfd02d7
add new logo_full.svg file made by @fueru_konbu
lnanase Aug 20, 2017
f7466d0
update haml and css files to be related logo_full.svg
lnanase Aug 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/javascript/images/logo_full.svg
View file
Open in desktop
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 app/javascript/styles/about.scss
View file
Open in desktop
Expand Up @@ -462,7 +462,7 @@
}

img {
height: 32px;
height: 64px;
position: relative;
top: 4px;
left: -10px;
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/styles/admin.scss
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
.logo {
display: block;
margin: 40px auto;
width: 100px;
width: 220px;
height: 100px;
}

Expand Down
2 changes: 1 addition & 1 deletion app/javascript/styles/containers.scss
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
align-items: center;

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

Expand Down
2 changes: 1 addition & 1 deletion app/views/about/more.html.haml
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
.container.links
.brand
= link_to root_url do
= image_tag asset_pack_path('logo.svg'), alt: 'Mastodon'
= image_tag asset_pack_path('logo_full.svg'), alt: 'iMastodon'

%ul.nav
%li
Expand Down
2 changes: 1 addition & 1 deletion app/views/about/show.html.haml
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
.container.links
.brand
= link_to root_url do
= image_tag asset_pack_path('logo.svg'), alt: 'Mastodon'
= image_tag asset_pack_path('logo_full.svg'), alt: 'iMastodon'

%ul.nav
%li
Expand Down
2 changes: 1 addition & 1 deletion app/views/about/terms.html.haml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
.container.links
.brand
= link_to root_url do
= image_tag asset_pack_path('logo.svg'), alt: 'Mastodon'
= image_tag asset_pack_path('logo_full.svg'), alt: 'iMastodon'

%ul.nav
%li
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/admin.html.haml
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
.sidebar-wrapper
.sidebar
= link_to root_path do
= image_tag asset_pack_path('logo.svg'), class: 'logo', alt: 'Mastodon'
= image_tag asset_pack_path('logo_full.svg'), class: 'logo', alt: 'iMastodon'

= render_navigation
.content-wrapper
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/auth.html.haml
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
.logo-container
%h1
= link_to root_path do
= image_tag asset_pack_path('logo.svg'), alt: 'Mastodon'
= image_tag asset_pack_path('logo_full.svg'), alt: 'iMastodon'

.form-container
= render 'flashes'
Expand Down