Merge branch 'static' of https://git.zom.bi/bsod/brc into static

collections.php

@@ -14,7 +14,7 @@
           <div class="col-img-desc">
             <div>
               <p>' . $c['name'] . '</p>
-              <a href="show_gallery.php?id=' . $index .'" class="button button-accent button-small">Details</a>
+              <a href="show_collection.php?id=' . $index .'" class="button button-accent button-small">Details</a>
             </div>
           </div>
         </div>

css/projects.css

@@ -1,3 +1,52 @@
+/* FONTS */
+/* im-fell-english-sc-regular - latin */
+@font-face {
+    font-family: 'IM Fell English SC';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/im-fell-english-sc-v10-latin-regular.eot'); /* IE9 Compat Modes */
+    src: local('IM FELL English SC'), local('IM_FELL_English_SC'),
+         url('../fonts/im-fell-english-sc-v10-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+         url('../fonts/im-fell-english-sc-v10-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+         url('../fonts/im-fell-english-sc-v10-latin-regular.woff') format('woff'), /* Modern Browsers */
+         url('../fonts/im-fell-english-sc-v10-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+         url('../fonts/im-fell-english-sc-v10-latin-regular.svg#IMFellEnglishSC') format('svg'); /* Legacy iOS */
+  }
+/* im-fell-great-primer-regular - latin */
+@font-face {
+    font-family: 'IM Fell Great Primer';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/im-fell-great-primer-v10-latin-regular.eot'); /* IE9 Compat Modes */
+    src: local('IM FELL Great Primer Roman'), local('IM_FELL_Great_Primer_Roman'),
+         url('../fonts/im-fell-great-primer-v10-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+         url('../fonts/im-fell-great-primer-v10-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+         url('../fonts/im-fell-great-primer-v10-latin-regular.woff') format('woff'), /* Modern Browsers */
+         url('../fonts/im-fell-great-primer-v10-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+         url('../fonts/im-fell-great-primer-v10-latin-regular.svg#IMFellGreatPrimer') format('svg'); /* Legacy iOS */
+  }
+  
+  /* im-fell-great-primer-italic - latin */
+  @font-face {
+    font-family: 'IM Fell Great Primer';
+    font-style: italic;
+    font-weight: 400;
+    src: url('../fonts/im-fell-great-primer-v10-latin-italic.eot'); /* IE9 Compat Modes */
+    src: local('IM FELL Great Primer Italic'), local('IM_FELL_Great_Primer_Italic'),
+         url('../fonts/im-fell-great-primer-v10-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+         url('../fonts/im-fell-great-primer-v10-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
+         url('../fonts/im-fell-great-primer-v10-latin-italic.woff') format('woff'), /* Modern Browsers */
+         url('../fonts/im-fell-great-primer-v10-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
+         url('../fonts/im-fell-great-primer-v10-latin-italic.svg#IMFellGreatPrimer') format('svg'); /* Legacy iOS */
+  }
+  
+body {
+    font-family: 'IM Fell Great Primer';
+}
+
+h1, h2, h3, h4, h5 {
+    font-family: 'IM Fell English SC'
+}
 
 div.collection_container {
     display: flex;
@@ -34,7 +83,6 @@ div.collection h1 {
 
 div.collection div.col-desc {
     padding: 10px;
-    font-family: sans-serif; /* FIXME: find suitable font */
     text-align: justify;
 }
 

css/styles.css

@@ -1,5 +1,3 @@
-@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,700,900");
-@import url("stylesheet.css");
 @import url("projects.css");
 
 * {
@@ -9,7 +7,6 @@
 
 body {
     margin: 0;
-    font-family: "dominican_small_capsregular";
     text-align: center;
     background-color: #000;
     color: #f9f9ed;
@@ -305,7 +302,8 @@ p:last-of-type {
     }
 }
 header {
-	background: rgba(0,0,0,0.4);
+    background: rgba(0,0,0,0.4);
+    font-family: 'IM Fell English SC';
 	margin: 0px;                                                 /*Der Versuch den header auf projects zu reparieren: margin: 1rem 0,0 klappt aber nicht so*/
 }
 
@@ -322,11 +320,17 @@ header {
     margin: 0;
     padding: 0;
     list-style: none;
+    display: flex;
+    justify-content: center;
+    width: 100%;
 }
 
 .nav li {
-    display: inline-block;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     margin: 1em;
+    height: 20px;
     text-align: center;
 }
 
@@ -334,16 +338,15 @@ header {
     font-weight: 900;
     text-decoration: none;
     /*! padding: 0.5em; */
-    text-transform: uppercase;
     color: white;
-    font-size: 10pt;
+    font-size: 14pt;
     /*! font-weight: bold; */
 }
 
 
 .nav a:hover {
     color: #ddd;
-    font-size: 11pt;
+    font-size: 16pt;
     /*! font-weight: bold; */
 }
 

css/stylesheet.css

@@ -1,25 +0,0 @@
-/*! Generated by Font Squirrel (https://www.fontsquirrel.com) on June 17, 2020 */
-
-@font-face {
-    font-family: "dominican_italicregular";
-    src: url("../fonts/domii___-webfont.woff2") format("woff2"),
-        url("../fonts/domii___-webfont.woff") format("woff");
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: "dominicanregular";
-    src: url("../fonts/dominica-webfont.woff2") format("woff2"),
-        url("../fonts/dominica-webfont.woff") format("woff");
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: "dominican_small_capsregular";
-    src: url("../fonts/domisc__-webfont.woff2") format("woff2"),
-        url("../fonts/domisc__-webfont.woff") format("woff");
-    font-weight: normal;
-    font-style: normal;
-}

fonts/generator_config.txt

@@ -1,5 +0,0 @@
-# Font Squirrel Font-face Generator Configuration File
-# Upload this file to the generator to recreate the settings
-# you used to create these fonts.
-
-{"mode":"optimal","formats":["woff","woff2"],"tt_instructor":"default","fix_gasp":"xy","fix_vertical_metrics":"Y","metrics_ascent":"","metrics_descent":"","metrics_linegap":"","add_spaces":"Y","add_hyphens":"Y","fallback":"none","fallback_custom":"100","options_subset":"basic","subset_custom":"","subset_custom_range":"","subset_ot_features_list":"","css_stylesheet":"stylesheet.css","filename_suffix":"-webfont","emsquare":"2048","spacing_adjustment":"0"}

header.tpl

@@ -17,7 +17,7 @@
             <ul>
                 <li><a href="/">Home</a></li>
                 <li><a href="about.php">About</a></li>
-                <li><a href="projects.php">Projects</a></li>
+                <li><a href="collections.php">Collections</a></li>
                 <li><a href="contacts.php">Contacts</a></li>
             </ul>
         </nav>