tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.
This commit is contained in:
Claire
2022-06-21 08:28:59 +02:00
parent 7a75bce1b4 27f41768e8
commit 0e74d4da59
172 changed files with 1982 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/branding_helper.rb
View File

@ -15,7 +15,7 @@ module BrandingHelper
end
def _logo_as_symbol_icon
content_tag(:svg, tag(:use, href: '#logo-symbol-icon'), viewBox: '0 0 79 75', class: 'logo logo--icon')
content_tag(:svg, tag(:use, href: '#logo-symbol-icon'), viewBox: '0 0 79 79', class: 'logo logo--icon')
end
def render_logo