Merge branch 'master' of gitlab.com:fabinfra/fabinfra-theme

2025-03-12 14:41:51 +01:00 · 2020-11-06 21:34:29 +01:00 · 2020-11-06 21:34:29 +01:00 · 12266c8324
commit 12266c8324
parent dec1f31f23 ec7d7d6554
27 changed files with 83 additions and 47 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+public/
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2018 Nathan Day, TheJoKlLa
+Copyright (c) 2018 TheJoKlLa

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -4,3 +4,6 @@ Responsive Theme without Javascript
 ## Main Colors
 1. #00d4aa
 2. #3c474d
+
+## Sponsors Logo
+880px x 625px
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@ -1,15 +1,11 @@
       <footer class="footer">
-            {{ if .Params.sponsor }}
-            <div class="sponsor_placeholder"></div>
-            {{ end }}
-
            <div class="text">
            <p>Powered by <a href="https://gohugo.io">Hugo</a>. Themed by <a href="https://gitlab.com/fabinfra/fabinfra-theme">FabInfra</a>.</p>
            
            {{ if .Site.Home.AllTranslations}}
            <ul class="lang">
                {{ range $.Site.Home.AllTranslations }}
-                <li><a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a></li>
+                <li><a href="{{ replace $.Page.URL $.Page.Language.Lang .Language.Lang}}">{{ .Language.LanguageName }}</a></li>
                {{ end }}
            </ul>
            {{ end }}
@ -17,6 +13,8 @@

            {{ if .Params.sponsor }}
            <img class="sponsor" src="{{ .Params.sponsor }}"/>
+            {{else}}
+            <img class="sponsor" src="/img/sponsors/FabInfra.png"/>
            {{ end }}
        </footer>
    </body>
--- a/layouts/partials/head_meta.html
+++ b/layouts/partials/head_meta.html
@ -3,9 +3,20 @@
        <meta charset="utf-8"/>
        <meta name="viewport" content="width=device-width, initial-scale=1.0">
        <link rel="stylesheet" href="/css/color.css">
+        <link rel="stylesheet" href="/css/size.css">
        <link rel="stylesheet" href="/css/main.css">
        <link rel="stylesheet" href="/css/content.css">
        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Mina">
        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto">
+
+        <link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png">
+        <link rel="manifest" href="/img/favicon/site.webmanifest">
+        <link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#3c474d">
+        <meta name="msapplication-TileColor" content="#3c474d">
+        <meta name="theme-color" content="#3c474d">
+
+        <title>{{ $.Site.Title }} - {{ $.Page.Title }}</title>
    </head>
    <body>
--- a/static/css/content.css
+++ b/static/css/content.css
@ -35,25 +35,34 @@ main .list-project .content {
 }

 /* project sites */
-main .header-project .content{
-    display: flex;
-
+main .header-project .content {
    padding-top: 5px;
    margin-top: 10px;
-    max-height: 200px;
+    display: flex;
+
+    flex-direction: row;
+    justify-content: space-between;
 }
 main .header-project .content .logo {
-    width: 200px;
-    margin-left: auto;
-    margin-right: 20px;
+    align-self: center;
+    height: 200px;
 }

-main .header-project .content .logo img {
-    width: : 100%;
-}
+/* Change Grid Structure */
+@media (max-width: 30em) {
+    main .header-project .content {       
+        flex-direction: column-reverse;
+        justify-content: space-between;
+    }

-@media (max-width: 35em) {
    main .header-project .content .logo {
-        display: none;
+        align-self: center;
+        width: 200px;
    }
 }
+
+/* images */
+.text-justify img {
+    display: block;
+    margin: 50px auto;
+}
--- a/static/css/main.css
+++ b/static/css/main.css
@ -117,14 +117,6 @@ body {
  top:0;
 }

-/* main */
-main {
-  padding: 75px 30px 100px 30px;
-  font-family: Roboto, sans-serif;
-}
-
-/* 48em = 768px @ 16pt font */
-
@media (min-width: 48em) {
  .header li {
    float: left;
@ -140,6 +132,16 @@ main {
  .header .menu-icon {
    display: none;
  }
+}
+
+/* main */
+main {
+  padding: 75px 30px 150px 30px;
+  font-family: Roboto, sans-serif;
+}
+
+/* Change Padding for Mobile View */
+@media (min-width: 48em) {
  main {
    padding: 75px 150px 100px 150px;
  }
@ -158,24 +160,32 @@ main {
  bottom: 0;
  width: 100%;
  padding: 20px 0px;
-  display: flex;
+  display: grid;
+  grid-template-columns: 20px 100px 10px auto 10px 100px 20px;
 }

-.footer .text{
-  margin-right: auto;
-  margin-left: auto;
+.footer .text {
+  grid-column-start: 4;
 }

-.footer .sponsor{
-  height: 76px;
-  width: 115px;
-  margin: -15px 30px -15px auto;
+.footer .sponsor {
+  grid-column-start: 6;
+  width: 100%;
 }

-.footer .sponsor_placeholder{
-  height: 76px;
-  width: 115px;
-  margin: -15px auto -15px 30px;
+/* Change Grid Structure */
+@media (max-width: 48em) {
+  .footer  {
+    grid-template-columns: 10px auto 10px 100px 10px;
+  }
+
+  .footer .text {
+    grid-column-start: 2;
+  }
+
+  .footer .sponsor {
+    grid-column-start: 4;
+  }
 }

 .footer p {
--- a/static/css/size.css
+++ b/static/css/size.css
@ -0,0 +1,4 @@
+:root {
+  --size-normal: 48em;
+  --size-small: 35em;
+}
--- a/static/img/favicon/android-chrome-192x192.png
+++ b/static/img/favicon/android-chrome-192x192.png
--- a/static/img/favicon/android-chrome-512x512.png
+++ b/static/img/favicon/android-chrome-512x512.png
--- a/static/img/favicon/apple-touch-icon.png
+++ b/static/img/favicon/apple-touch-icon.png
--- a/static/img/favicon/browserconfig.xml
+++ b/static/img/favicon/browserconfig.xml
@ -2,7 +2,7 @@
 <browserconfig>
    <msapplication>
        <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
+            <square150x150logo src="/img/favicon/mstile-150x150.png"/>
            <TileColor>#3c474d</TileColor>
        </tile>
    </msapplication>
--- a/static/img/favicon/favicon-16x16.png
+++ b/static/img/favicon/favicon-16x16.png
--- a/static/img/favicon/favicon-32x32.png
+++ b/static/img/favicon/favicon-32x32.png
--- a/static/img/favicon/favicon.ico
+++ b/static/img/favicon/favicon.ico
--- a/static/img/favicon/logo_512x512.png
+++ b/static/img/favicon/logo_512x512.png
--- a/static/img/favicon/mstile-144x144.png
+++ b/static/img/favicon/mstile-144x144.png
--- a/static/img/favicon/mstile-150x150.png
+++ b/static/img/favicon/mstile-150x150.png
--- a/static/img/favicon/mstile-310x150.png
+++ b/static/img/favicon/mstile-310x150.png
--- a/static/img/favicon/mstile-310x310.png
+++ b/static/img/favicon/mstile-310x310.png
--- a/static/img/favicon/mstile-70x70.png
+++ b/static/img/favicon/mstile-70x70.png
--- a/static/img/favicon/site.webmanifest
+++ b/static/img/favicon/site.webmanifest
@ -1,14 +1,14 @@
 {
-    "name": "",
-    "short_name": "",
+    "name": "FabInfra",
+    "short_name": "FabInfra",
    "icons": [
        {
-            "src": "/android-chrome-192x192.png",
+            "src": "/img/favicon/android-chrome-192x192.png",
            "sizes": "192x192",
            "type": "image/png"
        },
        {
-            "src": "/android-chrome-512x512.png",
+            "src": "/img/favicon/android-chrome-512x512.png",
            "sizes": "512x512",
            "type": "image/png"
        }
--- a/static/img/sponsors/BMBF.jpg
+++ b/static/img/sponsors/BMBF.jpg
--- a/static/img/sponsors/BMBF_DE.png
+++ b/static/img/sponsors/BMBF_DE.png
--- a/static/img/sponsors/BMBF_EN.png
+++ b/static/img/sponsors/BMBF_EN.png
--- a/static/img/sponsors/BMBF_ENG.jpg
+++ b/static/img/sponsors/BMBF_ENG.jpg
--- a/static/img/sponsors/FabInfra.png
+++ b/static/img/sponsors/FabInfra.png