organised favicons

moved browserconfig.xml to favicons folder
This commit is contained in:
David Alexander 2015-11-26 10:28:14 +13:00
parent 74c76e4c50
commit 51f69ed8f2
7 changed files with 44 additions and 48 deletions

View File

@ -12,11 +12,6 @@
<IfModule mod_rewrite.c>
RewriteEngine On
# Redirect requests for $AbsoluteBaseURL/favicon.ico to $AbsoluteBaseURL/$ThemeDir/favicons/favicon.ico
RewriteCond %{REQUEST_URI} !^/favicon\.ico [NC]
RewriteCond %{REQUEST_URI} favicon\.ico [NC]
RewriteRule (.*) http://docs.silverstripe.org/themes/docs/favicons/favicon.ico [R=301,L]
# Legacy rewrite from sapphire/ to framework/ namespace
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_URI} !^framework/main\.php
@ -226,14 +221,13 @@ ErrorDocument 500 /assets/error-500.html
FileETag INode MTime
<IfModule mod_expires.c>
ExpiresActive on
ExpiresByType image/* "access plus 7 days"
ExpiresByType text/css "access plus 7 days"
ExpiresByType application/x-javascript "access plus 7 days"
ExpiresByType application/javascript "access plus 7 days"
ExpiresActive on
ExpiresByType image/* "access plus 7 days"
ExpiresByType text/css "access plus 7 days"
ExpiresByType application/x-javascript "access plus 7 days"
ExpiresByType application/javascript "access plus 7 days"
</IfModule>
<IfModule mod_deflate.c>
SetOutputFilter DEFLATE
</IfModule>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="/mstile-70x70.png"/>
<square150x150logo src="/mstile-150x150.png"/>
<square310x310logo src="/mstile-310x310.png"/>
<wide310x150logo src="/mstile-310x150.png"/>
<TileColor>#005b94</TileColor>
</tile>
</msapplication>
</browserconfig>

BIN
favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="mstile-70x70.png"/>
<square150x150logo src="mstile-150x150.png"/>
<square310x310logo src="mstile-310x310.png"/>
<wide310x150logo src="mstile-310x150.png"/>
<TileColor>#005b94</TileColor>
</tile>
</msapplication>
</browserconfig>

View File

@ -2,37 +2,37 @@
"name": "SilverStripe",
"icons": [
{
"src": "\/android-chrome-36x36.png",
"src": "android-chrome-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/android-chrome-48x48.png",
"src": "android-chrome-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/android-chrome-72x72.png",
"src": "android-chrome-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/android-chrome-96x96.png",
"src": "android-chrome-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/android-chrome-144x144.png",
"src": "android-chrome-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/android-chrome-192x192.png",
"src": "android-chrome-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"

View File

@ -0,0 +1,20 @@
<link rel="apple-touch-icon" sizes="57x57" href="$ThemeDir/favicons/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="$ThemeDir/favicons/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="$ThemeDir/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="$ThemeDir/favicons/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="$ThemeDir/favicons/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="$ThemeDir/favicons/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="$ThemeDir/favicons/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="$ThemeDir/favicons/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="$ThemeDir/favicons/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-194x194.png" sizes="194x194">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="$ThemeDir/favicons/manifest.json"> <%-- Controls which icon to use for Android Chrome --%>
<link rel="mask-icon" href="$ThemeDir/favicons/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-config" content="$ThemeDir/favicons/browserconfig.xml">
<meta name="msapplication-TileColor" content="#005b94">
<meta name="msapplication-TileImage" content="$ThemeDir/favicons/mstile-144x144.png">
<meta name="theme-color" content="#1b354c">

View File

@ -3,25 +3,7 @@
<meta charset="utf-8" />
<title><% if Title %>$Title &#8211; <% end_if %>SilverStripe Documentation</title>
<link rel="apple-touch-icon" sizes="57x57" href="$ThemeDir/favicons/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="$ThemeDir/favicons/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="$ThemeDir/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="$ThemeDir/favicons/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="$ThemeDir/favicons/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="$ThemeDir/favicons/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="$ThemeDir/favicons/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="$ThemeDir/favicons/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="$ThemeDir/favicons/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-194x194.png" sizes="194x194">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="$ThemeDir/favicons/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="$ThemeDir/favicons/manifest.json"> <%-- Controls which icon to use for Android Chrome --%>
<link rel="mask-icon" href="$ThemeDir/favicons/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#005b94">
<meta name="msapplication-TileImage" content="$ThemeDir/favicons/mstile-144x144.png">
<meta name="theme-color" content="#1b354c">
<% include DocumentationFavicons %>
<link rel="stylesheet" href="$ThemeDir/css/ionicons.min.css" />
<link rel="stylesheet" href="$ThemeDir/css/styles.css" />