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

carddeck1/cards.html

@@ -11,26 +11,36 @@
     <section>
     
     <div class="card">
-        <h2>body</h2>
+        <h2>SHAHMARAN</h2>
-        <p class = 'image'><img src='./images/3.jpg'></p>
+        <p class = 'image'><img src='./images/10.jpg'></p>
-        <p class = 'text'>Some text of this card</p>
+        <p class = 'text'></p>
     </div>
     
     <div class="card">
-        <h2>panopticon</h2>
+        <h2>RESISTANCE</h2>
-        <p class = 'image'><img src='./images/2.jpg'></p>
+        <p class = 'image'><img src='./images/11.jpg'></p>
-        <p class = 'text'>The panopticon is a design of institutional building with an inbuilt system of control!</p>
+        <p class = 'text'></p>
     </div>
     
     <div class="card">
-        <h2></h2>
+        <h2>IDENTIFY ME</h2>
-        <p class = 'textnoimage'>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</p>
+        <p class = 'image'><img src='./images/9.jpg'></p>
+        <p class = 'text'></p>
+    </div>
+    <div class="card">
+        <h2>DARLING, DARLING</h2>
+        <p class = 'image'><img src='./images/7.jpg'></p>
+        <p class = 'text'></p>
+    </div>
+    <div class="card">
+        <h2>I HAD A DREAM</h2>
+        <p class = 'image'><img src='./images/4.jpg'></p>
+        <p class = 'text'></p>
     </div>
 
     <div class="card">
-        <h2>gezi</h2>
+        <h2></h2>
-        <p class = 'image'><img src='./images/3.jpg'></p>
+        <p class = 'textnoimage'>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</p>
-        <p class = 'text'>these are the protests in 2013</p>
     </div>
     
     </section>

carddeck1/cards.json

@@ -25,28 +25,28 @@
 		"image": "4.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "RESISTANCE",
-		"text" : "Some text of this card",
+		"text" : "",
-		"image": "4.jpg"
+		"image": "11.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "SHAHMARAN",
-		"text" : "Some text of this card",
+		"text" : "",
-		"image": "4.jpg"
+		"image": "10.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "IDENTIFY ME",
-		"text" : "Some text of this card",
+		"text" : "",
-		"image": "4.jpg"
+		"image": "9.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "DARLING, DARLING",
-		"text" : "Some text of this card",
+		"text" : "",
-		"image": "4.jpg"
+		"image": "7.jpg"
 	},
 	{
-		"name" : "body",
+		"name" : "I HAD A DREAM",
-		"text" : "Some text of this card",
+		"text" : "",
 		"image": "4.jpg"
 	},
 	{

carddeck1/stylesheet.css

@@ -1,20 +1,19 @@
 .card
 {
-    width: 70mm;
+    width: 8.5cm;
-    height: 95mm;
+    height: 13.5cm;
-    border: solid 1px black;
+    border: solid 3px black;
     border-radius: 10px;
-    box-shadow: 5px 5px 0px gray;
     float: left;
-    margin: 2mm;
     position: relative;
+    margin: 2mm;
 }
 .card > p.image > img {
-   width: 50mm;
+   width: 8.5cm;
-   height: 50mm;
+   height: 12cm;
    position: absolute;
-   top: 30mm;
+   top: 15mm; 
-   left: 10mm; 
+   border-radius: 10px;
 }
 .card > h2{
     top: 5mm;
@@ -22,6 +21,7 @@
     margin: 0;
     text-align: center;
     padding-top: 5mm;
+    font-size: 9;
 }
 .card > p.text {
     width: 50mm;
@@ -40,5 +40,5 @@
     left: 5mm;
     right: 5mm;
     text-align: center;
-    font-size: 8; 
+    font-size: 6.5; 
  }