yMerge branch 'main' of https://git.xpub.nl/XPUB/SI20

2 years ago · de1ac2ffd4
parent ba0a465574 d4a0e8cbf8
commit de1ac2ffd4
3 changed files with 20 additions and 19 deletions
--- a/carddeck1/cards.html
+++ b/carddeck1/cards.html
@ -7,7 +7,7 @@
        <link href="stylesheet.css" rel="stylesheet">
    </head>
    <body>
-<h1>cards</h1>
+<h1>Fiction Friction</h1>
    <section>
    <div class="card">
--- a/carddeck1/cards.json
+++ b/carddeck1/cards.json
@ -1,28 +1,28 @@
 {
 	"cards" : [{
-		"name" : "body",
+		"name" : "",
 		"text" : "Some text of this card",
-		"image": "4.jpg"
+		"image": "1.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "",
 		"text" : "Some text of this card",
-		"image": "4.jpg"
+		"image": "2.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "",
 		"text" : "Some text of this card",
-		"image": "4.jpg"
+		"image": "3.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "",
 		"text" : "Some text of this card",
-		"image": "4.jpg"
+		"image": "5.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "",
 		"text" : "Some text of this card",
-		"image": "4.jpg"
+		"image": "6.jpg"
 	},
 	{
 		"name" : "RESISTANCE",
@ -51,7 +51,7 @@
 	},
 	{
 		"name" : "",
-		"text" : "been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. Lorem lorem lorem lorem",
+		"text" : "",
 		"image": ""
 	},
 	]
--- a/carddeck1/stylesheet.css
+++ b/carddeck1/stylesheet.css
@ -1,7 +1,7 @@
 .card
 {
-    width: 8.5cm;
+    width: 7.5cm;
-    height: 13.5cm;
+    height: 11.5cm;
    border: solid 3px black;
    border-radius: 10px;
    float: left;
@ -9,10 +9,10 @@
    margin: 2mm;
 }
 .card > p.image > img {
-   width: 8.5cm;
+   width: 7.5cm;
-   height: 12cm;
+   height: 10.6cm;
   position: absolute;
-   top: 15mm; 
+   top: 10mm; 
   border-radius: 10px;
 }
 .card > h2{
@ -20,8 +20,9 @@
    left: 5mm;
    margin: 0;
    text-align: center;
-    padding-top: 5mm;
+    padding-top: 3mm;
-    font-size: 9;
+    font-size: 15px;
    font-family:monospace;
 }
 .card > p.text {
    width: 50mm;