Browse Source

New logo (#4306)

* Add new logo

* Remove unused images
pull/4/head
Eugen Rochko 7 years ago
committed by GitHub
parent
commit
0e0f18ce7c
21 changed files with 17 additions and 11 deletions
  1. BIN
     
  2. BIN
     
  3. BIN
     
  4. BIN
     
  5. +1
    -1
      app/javascript/images/logo.svg
  6. +1
    -0
      app/javascript/images/logo_alt.svg
  7. +1
    -0
      app/javascript/images/logo_full.svg
  8. BIN
     
  9. +8
    -1
      app/javascript/styles/about.scss
  10. +1
    -2
      app/javascript/styles/containers.scss
  11. +1
    -2
      app/views/about/show.html.haml
  12. +1
    -1
      app/views/layouts/admin.html.haml
  13. +1
    -2
      app/views/layouts/auth.html.haml
  14. BIN
     
  15. BIN
     
  16. BIN
     
  17. +1
    -1
      public/browserconfig.xml
  18. BIN
     
  19. BIN
     
  20. +1
    -1
      public/mask-icon.svg
  21. BIN
     

BIN
View File


BIN
View File


BIN
View File


BIN
View File


+ 1
- 1
app/javascript/images/logo.svg View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" height="1000" width="1000"><path d="M500 0a500 500 0 0 0-353.553 146.447 500 500 0 1 0 707.106 707.106A500 500 0 0 0 500 0zm-.059 280.05h107.12c-19.071 13.424-26.187 51.016-27.12 73.843V562.05c0 44.32-35.68 80-80 80s-80-35.68-80-80v-202c0-44.32 35.68-80 80-80zm-.441 52c-15.464 0-28 12.537-28 28 0 15.465 12.536 28 28 28s28-12.535 28-28c0-15.463-12.536-28-28-28zm-279.059 7.9c44.32 0 80 35.68 80 80v206.157c.933 22.827 8.049 60.42 27.12 73.842H220.44c-44.32 0-80-35.68-80-80v-200c0-44.32 35.68-80 80-80zm559.12 0c44.32 0 80 35.68 80 80v200c0 44.32-35.68 80-80 80H672.44c19.071-13.424 26.187-51.016 27.12-73.843V419.95c0-44.32 35.68-80 80-80zM220 392c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm560 0c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm-280.5 40.05c-15.464 0-28 12.537-28 28 0 15.465 12.536 28 28 28s28-12.535 28-28c0-15.463-12.536-28-28-28zM220 491.95c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zm560 0c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zM499.5 532c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zM220 591.95c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zm560 0c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28z" fill="#fff"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="61.076954mm" height="65.47831mm" viewBox="0 0 216.4144 232.00976"><path d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915" fill="#3088d4"/><path d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#fff"/></svg>

+ 1
- 0
app/javascript/images/logo_alt.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="61.077141mm" height="65.47831mm" viewBox="0 0 216.41507 232.00976"><path d="M211.80683 139.0875c-3.1825 16.36625-28.4925 34.2775-57.5625 37.74875-15.16 1.80875-30.0825 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.3925 27.9425 21.115.7225 39.91625-5.20625 39.91625-5.20625l.86875 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23183 213.82 1.40558 165.31125.20808 116.09125c-.36375-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67058 3.45375 78.20308.2425 107.86433 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.97625 14.7525 32.97625 65.0825 0 0 .4125 37.13375-4.6 62.915" fill="#3088d4"/><path d="M65.68743 96.45938c0 9.01375-7.3075 16.32125-16.3225 16.32125-9.01375 0-16.32-7.3075-16.32-16.32125 0-9.01375 7.30625-16.3225 16.32-16.3225 9.015 0 16.3225 7.30875 16.3225 16.3225M124.52893 96.45938c0 9.01375-7.30875 16.32125-16.3225 16.32125-9.01375 0-16.32125-7.3075-16.32125-16.32125 0-9.01375 7.3075-16.3225 16.32125-16.3225 9.01375 0 16.3225 7.30875 16.3225 16.3225M183.36933 96.45938c0 9.01375-7.3075 16.32125-16.32125 16.32125-9.01375 0-16.32125-7.3075-16.32125-16.32125 0-9.01375 7.3075-16.3225 16.32125-16.3225 9.01375 0 16.32125 7.30875 16.32125 16.3225" fill="#fff"/></svg>

+ 1
- 0
app/javascript/images/logo_full.svg
File diff suppressed because it is too large
View File


BIN
View File


+ 8
- 1
app/javascript/styles/about.scss View File

@ -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;
}
}
}

+ 1
- 2
app/javascript/styles/containers.scss View File

@ -23,8 +23,7 @@
align-items: center;
img {
width: 32px;
height: 32px;
height: 42px;
margin-right: 10px;
}

+ 1
- 2
app/views/about/show.html.haml View File

@ -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

+ 1
- 1
app/views/layouts/admin.html.haml View File

@ -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

+ 1
- 2
app/views/layouts/auth.html.haml View File

@ -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'

BIN
View File


BIN
View File


BIN
View File


+ 1
- 1
public/browserconfig.xml View File

@ -3,7 +3,7 @@
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#2b5797</TileColor>
<TileColor>#282c37</TileColor>
</tile>
</msapplication>
</browserconfig>

BIN
View File


BIN
View File


+ 1
- 1
public/mask-icon.svg View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><path d="M8 .1A7.9 7.9 0 0 0 .1 8 7.9 7.9 0 0 0 8 15.9 7.9 7.9 0 0 0 15.9 8 7.9 7.9 0 0 0 8 .1zm-.04 4.28h1.7c-.33.23-.44.9-.44 1.25v3.2c0 .7-.55 1.24-1.26 1.24-.7 0-1.26-.55-1.26-1.25v-3.2c0-.68.55-1.24 1.26-1.24zm-4.36.78c.7 0 1.26.55 1.26 1.24v3.2c0 .34.1 1.02.43 1.24H3.6c-.7 0-1.26-.55-1.26-1.24V6.4c0-.7.55-1.24 1.26-1.24zm8.7 0c.7 0 1.26.55 1.26 1.24v3.2c0 .7-.56 1.24-1.27 1.24h-1.7c.32-.22.43-.9.43-1.24V6.4c0-.7.56-1.24 1.26-1.24z" fill="#000"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 94.023018 100.80365" height="28.44903mm" width="26.535385mm"><path d="M72.57077 49.00625c-3.9125 0-7.085-3.1825-7.085-7.095 0-3.91125 3.1725-7.09375 7.085-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m-25.55875 0c-3.9225 0-7.095-3.1825-7.095-7.095 0-3.91125 3.1725-7.09375 7.095-7.09375 3.91125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1825 7.095-7.09375 7.095m-25.57 0c-3.91125 0-7.08375-3.1825-7.08375-7.095 0-3.91125 3.1725-7.09375 7.08375-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m72.5775-15.905c0-21.86625-14.32375-28.27375-14.32375-28.27375-7.23-3.31875-19.63-4.7125-32.5175-4.8275h-.3125c-12.88875.115-25.28875 1.50875-32.5075 4.8275 0 0-14.32375 6.4075-14.32375 28.27375 0 5.00375-.105 10.995.05125 17.34C.60577 71.83 4.00702 92.905 23.78327 98.1375c9.1125 2.4125 16.945 2.9125 23.24875 2.56875 11.4225-.63375 17.84-4.07625 17.84-4.07625l-.37375-8.3025s-8.16625 2.58-17.34125 2.2675c-9.09125-.3125-18.6825-.9775-20.16-12.13875-.135-.97875-.1975-2.02875-.1975-3.13125 0 0 8.915 2.185 20.2325 2.69375 6.9075.3225 13.39875-.39375 19.98375-1.185 12.6275-1.50875 23.62375-9.29 25.0075-16.405 2.17375-11.1925 1.99625-27.3275 1.99625-27.3275" fill="#000"/></svg>

BIN
View File


Loading…
Cancel
Save