Merge branch 'master' of http://localhost:3000/vesper/freibier.ccHomepage

2020-12-20 18:39:59 +01:00 · 2020-12-20 18:39:59 +01:00 · 8975f55e22
parent d269f4b6a0 814d5c6c83
commit 8975f55e22
24 changed files with 95 additions and 2 deletions
--- a/img/android-icon-192x192.png
+++ b/img/android-icon-192x192.png
--- a/img/apple-icon-114x114.png
+++ b/img/apple-icon-114x114.png
--- a/img/apple-icon-120x120.png
+++ b/img/apple-icon-120x120.png
--- a/img/apple-icon-144x144.png
+++ b/img/apple-icon-144x144.png
--- a/img/apple-icon-152x152.png
+++ b/img/apple-icon-152x152.png
--- a/img/apple-icon-180x180.png
+++ b/img/apple-icon-180x180.png
--- a/img/apple-icon-57x57.png
+++ b/img/apple-icon-57x57.png
--- a/img/apple-icon-60x60.png
+++ b/img/apple-icon-60x60.png
--- a/img/apple-icon-72x72.png
+++ b/img/apple-icon-72x72.png
--- a/img/apple-icon-76x76.png
+++ b/img/apple-icon-76x76.png
--- a/img/browserconfig.xml
+++ b/img/browserconfig.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
--- a/img/favicon-16x16.png
+++ b/img/favicon-16x16.png
--- a/img/favicon-256x256.png
+++ b/img/favicon-256x256.png
--- a/img/favicon-32x32.png
+++ b/img/favicon-32x32.png
--- a/img/favicon-96x96.png
+++ b/img/favicon-96x96.png
--- a/img/favicon.ico
+++ b/img/favicon.ico
--- a/img/manifest.json
+++ b/img/manifest.json
@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
--- a/img/ms-icon-144x144.png
+++ b/img/ms-icon-144x144.png
--- a/img/ms-icon-150x150.png
+++ b/img/ms-icon-150x150.png
--- a/img/ms-icon-310x310.png
+++ b/img/ms-icon-310x310.png
--- a/img/ms-icon-70x70.png
+++ b/img/ms-icon-70x70.png
--- a/index.html
+++ b/index.html
@ -6,6 +6,23 @@
    <title>freibier.cc</title>
    <link rel="stylesheet" media="screen" href="https://freibier.cc/style/fonts/HKGrotesk_2466/hk-grotesk.css" type="text/css"/>
    <link rel="stylesheet" href="./style/freibier.css">
+    <link rel="apple-touch-icon" sizes="57x57" href="./img/apple-icon-57x57.png"> 
+    <link rel="apple-touch-icon" sizes="60x60" href="./img/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="./img/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="./img/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="./img/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="./img/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="./img/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="./img/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="./img/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="./img/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="./img/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="./img/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="./img/favicon-16x16.png">
+    <link rel="manifest" href="./img/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="./img/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
  </head>
  <body>
 <div id="wrapper">
--- a/shop/index.html
+++ b/shop/index.html
@ -54,12 +54,15 @@
 	überwiesen ist, schicken wir euch das Paket zu.
    	</p>
  </div>
+    <div class="column right">
    <div class="column right">
    <h2>Aktuelles </h2>
-    <p>Hier findet ihr in Kürze aktuelle Informationen zu unseren Bieren, Events und Geschichten rund ums Bier.</p>
+    <p>Wir sind jetzt bei Facebook <br>
+	<a href="https://www.facebook.com/freibier.cc/"><div class="icon"><img src="img/Facebook_F_icon.svg" alt="https://www.facebook.com/freibier.cc/"></div> </a>
+    </p>
    <h2>Händler </h2>
    <p>Unser Biere bekommt ihr hier:</p><p> <a href="https://bierothek.de/stores/regensburg">Bierothek in Regensburg</a></p>    
-    <p> <a href="https://www.edeka-unger.de/">Edeka Unger in Lappersdorf</a></p>
+    <p> <a href="https://www.edeka-unger.de/">Edeka Unger in Lappersdorf</a></p> 
    </div>
 </div>

--- a/style/freibier.css
+++ b/style/freibier.css
@ -363,3 +363,33 @@ img {

 }

+/* Tag Cloud Blog */
+ul.tagcloud {
+  list-style: none;
+    padding: 0;
+}
+
+ul.tagcloud li {
+    display: inline-block;
+}
+
+li.tag-1 {
+    font-size: 150%;
+}
+
+li.tag-2 {
+    font-size: 120%;
+}
+
+li.tag-3 {
+    font-size: 100%;
+}
+
+li.tag-4 {
+    font-size: 80%;
+}
+
+ul.tagcloud .list-group-item span.badge {
+    background-color: grey;
+    color: white;
+}