Update default icon

diff --git a/Doxyfile b/Doxyfile
index a1676eba7a8638e6e40b46677035d5a03f5ba0d7..37855ceece7a5f1d9ff938d0a062490afc860982 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,7 +1,7 @@
 INPUT = README.md index.php boot.php update.php bin/ mod/ include/ view/ src/ VERSION
 RECURSIVE = YES
 PROJECT_NAME = "Friendica"
-PROJECT_LOGO = images/friendica-64.jpg
+PROJECT_LOGO = images/friendica-64.png
 EXCLUDE = .htconfig.php config/ library/ doc/ .git/ log/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
 EXCLUDE_PATTERNS = *smarty3* strings.php *.log *.out *test*
 OUTPUT_DIRECTORY = doc

diff --git a/doc/BBCode.md b/doc/BBCode.md
index dae630448f77dd6afd3e527ebfdcbb86952b8cd5..07b10683143802a6fa978b4416cef3112a9dff06 100644 (file)
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
   <td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
 </tr>
 <tr>
-  <td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]</td>
-  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Immagine/foto"></td>
+  <td>[img=32x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]</td>
+  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg" style="width: 32px;" alt="Immagine/foto"></td>
 </tr>
 <tr>
-  <td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]The Friendica Logo[/img]</td>
-  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="The Friendica Logo"></td>
+  <td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png]The Friendica Logo[/img]</td>
+  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png" alt="The Friendica Logo"></td>
 </tr>
 <tr>
-  <td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]<br>
+  <td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]<br>
 <br>Note: provided height is simply discarded.</td>
-  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" style="width: 64px;"></td>
+  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg" style="width: 64px;"></td>
 </tr>
 <tr>
   <td>[size=xx-small]small text[/size]</td>

diff --git a/doc/de/BBCode.md b/doc/de/BBCode.md
index 5949e67e18ed2e1d15839660999607f893f262f2..3c8a789a9b92ddc964a36dd63d435429e3ba6d4b 100644 (file)
--- a/doc/de/BBCode.md
+++ b/doc/de/BBCode.md
@@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
   <td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
 </tr>
 <tr>
-  <td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]</td>
-  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Immagine/foto"></td>
+  <td>[img=32x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]</td>
+  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg" style="width: 32px;" alt="Immagine/foto"></td>
 </tr>
 <tr>
-  <td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]Das Friendica Logo[/img]</td>
-  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Das Friendica Logo"></td>
+  <td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png]Das Friendica Logo[/img]</td>
+  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png" alt="Das Friendica Logo"></td>
 </tr>
 <tr>
-  <td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]<br>
+  <td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]<br>
 <br>Note: provided height is simply discarded.</td>
-  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" style="width: 64px;"></td>
+  <td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg" style="width: 64px;"></td>
 </tr>
 <tr>
   <td>[size=xx-small]kleiner Text[/size]</td>

diff --git a/images/friendica-16.png b/images/friendica-16.png
index 745b7ac6c5ab5c611182478b8de48950d125d4cd..b31c058d1183da081fdc01385cad9df599e9ff55 100644 (file)
Binary files a/images/friendica-16.png and b/images/friendica-16.png differ

diff --git a/images/friendica-192.png b/images/friendica-192.png
index 97537c6c3489dac48cd5bf53ff96db2524a81892..cf924c430d8066ccdea69c1a475f6278d0fa4162 100644 (file)
Binary files a/images/friendica-192.png and b/images/friendica-192.png differ

diff --git a/images/friendica-32.png b/images/friendica-32.png
index 61764bf20a35fb21995b667e9a5e25436685a8a7..e025e4c2785662ab603b9d296aaa23501f9be9d9 100644 (file)
Binary files a/images/friendica-32.png and b/images/friendica-32.png differ

diff --git a/images/friendica-512.png b/images/friendica-512.png
index e579478df627e5be9b6f9c6d367f2b296d73732f..54269b8b11021470c83c9c8b383b701214b07017 100644 (file)
Binary files a/images/friendica-512.png and b/images/friendica-512.png differ

diff --git a/images/friendica-64.png b/images/friendica-64.png
index 88cb8b016d42f3462bdbc731e61741924a6fadb0..2cdddedc88e98b6678cc55b7e51a759c9bdb8a16 100644 (file)
Binary files a/images/friendica-64.png and b/images/friendica-64.png differ

diff --git a/images/friendica.svg b/images/friendica.svg
index 45820959d515f3d370582c31982c109d5663eb35..180fe2a90e7bb2bbddf32aaa5326305cb6d01730 100644 (file)
--- a/images/friendica.svg
+++ b/images/friendica.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg2" width="96" height="96" version="1.1"><defs id="defs4"><linearGradient id="highlightgradient"><stop id="stop3833" offset="0" style="stop-color:#fff;stop-opacity:.74374998"/><stop style="stop-color:#fff;stop-opacity:0" id="stop3829" offset="1"/></linearGradient><linearGradient id="shadowgradient"><stop id="stop3833-5" offset="0" style="stop-color:#000;stop-opacity:.5"/><stop style="stop-color:#818080;stop-opacity:0" id="stop3829-9" offset="1"/></linearGradient><linearGradient id="linearGradient4011" x1="44.948" x2="54.103" y1="0" y2="46.797" gradientTransform="scale(1,0.54545455)" gradientUnits="userSpaceOnUse" xlink:href="#highlightgradient"/><linearGradient id="linearGradient4021" x1="52.017" x2="42.868" y1="96" y2="41.838" gradientTransform="matrix(1,0,0,0.5,0,48)" gradientUnits="userSpaceOnUse" xlink:href="#shadowgradient"/><filter id="filter4055" width="1.06" height="1.24" x="-.03" y="-.12"><feGaussianBlur id="feGaussianBlur4057" stdDeviation="1.2"/></filter><filter id="filter4059" width="1.06" height="1.244" x="-.03" y="-.122"><feGaussianBlur id="feGaussianBlur4061" stdDeviation="1.22"/></filter></defs><metadata id="metadata7"/><g id="layer1" transform="translate(0,-956.3622)" style="display:inline"><path style="fill:#ffc019;fill-opacity:1;stroke:none" id="rect2993" d="M 16,0 C 7.0091019,0.04308252 0,7.0521845 0,16 0,16 0,57.499123 0,80 0,89.120146 7.0091019,96 16,96 L 32,96 32,70 64,70 63.916016,46.068359 32,46.236328 32,26 64,26 64,0 C 64,0 24,0 16,0 z" transform="translate(0,956.3622)"/><path style="fill:#1872a2;fill-opacity:1;stroke:none" id="rect2993-6" d="m 80,1052.3622 c 8.990898,0 16.086165,-6.966 16,-16 0,0 0,-41.4991 0,-64 0.07767,-9.01639 -7.067354,-16 -16,-16 l -16,0 0,26 -32,0 0,22 32,0 0,22 -32,0 0,26 c 0,0 32,0 48,0 z"/></g><g style="display:inline" id="g3997"><path id="path3999" d="m 64,0 0,26 -32,0 0,22 m 32,0 0,22 -32,0 0,26" style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><rect id="rect4001" width="96" height="96" x="0" y="0" rx="16" ry="16" style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/></g><g id="layer3" style="display:none"><path style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path3926" d="m 64,0 0,26 -32,0 0,22 32,0 0,22 -32,0 0,26"/><rect style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="rect3928" width="96" height="96" x="0" y="0" rx="16" ry="16"/></g><g id="layer2" style="display:inline"><rect style="fill:url(#linearGradient3930);fill-opacity:1;stroke:none" id="rect3823" width="96" height="48.044" x="0" y="0" rx="15.215" ry="15.216"/><rect style="fill:url(#linearGradient3904);fill-opacity:1;stroke:none" id="rect3823-8" width="96" height="47.867" x="0" y="-96" rx="15.215" ry="15.16" transform="scale(1,-1)"/><rect style="fill:url(#linearGradient4011);fill-opacity:1;stroke:none;filter:url(#filter4059)" id="rect4003" width="98" height="24" x="0" y="0" rx="15.215" ry="8.299" transform="matrix(1.0296115,0,0,1.1963836,-2.901924,-4.7132067)"/><rect style="opacity:.56746030000000003;fill:url(#linearGradient4021);fill-opacity:1;stroke:none;filter:url(#filter4055)" id="rect4013" width="96" height="24" x="0" y="72" rx="14.008" ry="12" transform="matrix(0.9768331,0,0,0.91974646,1.1649641,8.098115)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192" viewBox="0 0 1920 1920">
+       <rect fill="#1872a2" x="60" y="60" width="1800" height="1800" rx="333"/>
+       <path fill="#febf19" d="M40 371q0-136 98-234 98-97 234-97h1178q136 0 233 97 97 98 97 234v1178q0 136-97 234-97 97-233 97H372q-137 0-234-97-97-98-98-234Zm1510-258h-296v442H666v373l587-4 1 441H666v442h884q107 0 182-75 75-74 74-183V371q0-108-74-182-74-75-182-76z"/>
+</svg>

diff --git a/mods/fpostit/fpostit.php b/mods/fpostit/fpostit.php
index ce66d3180a759c6516b0812d5587f23791852184..20c7b0889df63740457255df90695d900ddfad93 100644 (file)
--- a/mods/fpostit/fpostit.php
+++ b/mods/fpostit/fpostit.php
@@ -125,7 +125,7 @@ function showForm($error, $content) {
 
        echo <<<EOF
        <div class='wrap1'>
-               <h2><img class='logo' src='friendica-32.png' align='middle';/>
+               <h2><img class='logo' width="32" height="32" src='friendica.svg' align='middle';/>
                Friendica Bookmarklet</h2>
        </div>
 

diff --git a/mods/fpostit/friendica.svg b/mods/fpostit/friendica.svg
new file mode 100644 (file)
index 0000000..180fe2a
--- /dev/null
+++ b/mods/fpostit/friendica.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192" viewBox="0 0 1920 1920">
+       <rect fill="#1872a2" x="60" y="60" width="1800" height="1800" rx="333"/>
+       <path fill="#febf19" d="M40 371q0-136 98-234 98-97 234-97h1178q136 0 233 97 97 98 97 234v1178q0 136-97 234-97 97-233 97H372q-137 0-234-97-97-98-98-234Zm1510-258h-296v442H666v373l587-4 1 441H666v442h884q107 0 182-75 75-74 74-183V371q0-108-74-182-74-75-182-76z"/>
+</svg>

diff --git a/mods/fpostit/friendika-32.png b/mods/fpostit/friendika-32.png
deleted file mode 100644 (file)
index 61764bf..0000000
Binary files a/mods/fpostit/friendika-32.png and /dev/null differ

diff --git a/src/App/Page.php b/src/App/Page.php
index 41d50da055c625b87fc40e844560f6f117aa5ee7..14f0101ef07eb6f49d0207ec7620274c917a62c7 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -231,7 +231,7 @@ class Page implements ArrayAccess
 
                $shortcut_icon = $config->get('system', 'shortcut_icon');
                if ($shortcut_icon == '') {
-                       $shortcut_icon = 'images/friendica-32.png';
+                       $shortcut_icon = 'images/friendica.svg';
                }
 
                $touch_icon = $config->get('system', 'touch_icon');

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 213b4599f06beb51bece5efccb4ff2a1db43a03c..c30a157067f5a03b5428f85c336ac6bdb38478dd 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -304,7 +304,7 @@ class Nav
                // Provide a banner/logo/whatever
                $banner = DI::config()->get('system', 'banner');
                if (is_null($banner)) {
-                       $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
+                       $banner = '<a href="https://friendi.ca"><img id="logo-img" width="32" height="32" src="images/friendica.svg" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
                }
 
                $nav_info = [

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 4a20497a831c70a140135058902bac9b97117601..411f03b463f0204573b6e28df8d104438d452230 100644 (file)
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -142,7 +142,7 @@ class Smilies
                '<img class="smiley" src="' . $baseUrl . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
                '<img class="smiley" src="' . $baseUrl . '/images/like.gif" alt=":like" title=":like" />',
                '<img class="smiley" src="' . $baseUrl . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
-               '<a href="https://friendi.ca">~friendica <img class="smiley" src="' . $baseUrl . '/images/friendica-16.png" alt="~friendica" title="~friendica" /></a>',
+               '<a href="https://friendi.ca">~friendica <img class="smiley" width="16" height="16" src="' . $baseUrl . '/images/friendica.svg" alt="~friendica" title="~friendica" /></a>',
                '<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
                '<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
                ];

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 4c5c38ea542d4998cf3af4016297c46fbb6a03d6..515fb53c87524c02e04a6cff65bf0ba969765b2d 100644 (file)
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -450,7 +450,7 @@ class Site extends BaseAdmin
                $banner = DI::config()->get('system', 'banner');
 
                if ($banner == false) {
-                       $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
+                       $banner = '<a href="https://friendi.ca"><img id="logo-img" width="32" height="32" src="images/friendica.svg" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
                }
 
                $email_banner = DI::config()->get('system', 'email_banner');

diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 5ba9e47a31659dba68e95b0e8fb5f8b2ed489d20..2ef1bfe08fdd27ea30f5a3c493301bed5f0ef3d3 100644 (file)
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -12,7 +12,7 @@
        <link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="{{$media}}" />
 {{/foreach}}
 
-<link rel="shortcut icon" href="{{$shortcut_icon}}" />
+<link rel="icon" href="{{$shortcut_icon}}" />
 <link rel="apple-touch-icon" href="{{$touch_icon}}"/>
 
 <meta name="apple-mobile-web-app-capable" content="yes" />

diff --git a/view/templates/install_base.tpl b/view/templates/install_base.tpl
index 4907c2585729135fa32f66e663416b36e9bbdf54..a8a6c0ab9679d6c1ff52b279aa2b488895fb8090 100644 (file)
--- a/view/templates/install_base.tpl
+++ b/view/templates/install_base.tpl
@@ -1,4 +1,4 @@
-<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
 <p>

diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl
index 4574faf060b0c960e49a2d53fce4685e93af604c..26f47daad53705c6e40c9e30d25518639286da47 100644 (file)
--- a/view/templates/install_checks.tpl
+++ b/view/templates/install_checks.tpl
@@ -1,5 +1,5 @@
 
-<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 <form  action="{{$baseurl}}/index.php?pagename=install" method="post">
 <table>

diff --git a/view/templates/install_db.tpl b/view/templates/install_db.tpl
index f589223c7f124ab3ae9759891f06f92ca1786f33..e41975a94e87939dd2d635eb6e21a80bb6e1a44c 100644 (file)
--- a/view/templates/install_db.tpl
+++ b/view/templates/install_db.tpl
@@ -1,4 +1,4 @@
-<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
 <p>

diff --git a/view/templates/install_finished.tpl b/view/templates/install_finished.tpl
index 1d5d391c44c253d76ae9e9eb2e3801e29b70f969..4b321ff928e9ca6e23752b7bd632eb6834b89276 100644 (file)
--- a/view/templates/install_finished.tpl
+++ b/view/templates/install_finished.tpl
@@ -1,4 +1,4 @@
-<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
 {{foreach $checks as $check}}

diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl
index e17ef2456b9f1539fa5ef03ce96ee51cf046eeec..ff857f4c058159f4d4cc4765947167c757355c58 100644 (file)
--- a/view/templates/install_settings.tpl
+++ b/view/templates/install_settings.tpl
@@ -1,6 +1,6 @@
 
 
-<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
 

diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 7c81237441144d18de15005775d3eb626d5f987b..7851dacbd4d8e7f531f6b1d0be30a03d47f6c622 100644 (file)
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -60,7 +60,7 @@
        <link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="{{$media}}" />
 {{/foreach}}
 
-<link rel="shortcut icon" href="{{$shortcut_icon}}" />
+<link rel="icon" href="{{$shortcut_icon}}" />
 <link rel="apple-touch-icon" href="{{$touch_icon}}" />
 
 <meta name="apple-mobile-web-app-capable" content="yes" />