diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-03 23:29:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 23:29:41 +0200 |
| commit | 75b0fa8b760b8829b933b249ac48965abdab15ae (patch) | |
| tree | 4b2e5293f15972012c4dc876bb66870d692490d0 /app/views/layouts | |
| parent | 9c61dadc0db7009853c6b2345a02c3b219022929 (diff) | |
| parent | 89fcd68b7501f81a3e33f6b1abff6fc66f78e04b (diff) | |
Merge pull request #1324 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/embedded.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 2be9427c5..99ab3729e 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -40,6 +40,6 @@ %body{ class: body_classes } = content_for?(:content) ? yield(:content) : yield - %div{ style: 'display: none'} + .logo-resources = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg') = render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg') diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml index 6695b12dd..75441b452 100644 --- a/app/views/layouts/embedded.html.haml +++ b/app/views/layouts/embedded.html.haml @@ -23,5 +23,5 @@ %body.embed = yield - %div{ style: 'display: none'} + .logo-resources = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg') |