code réparé 23 mai

2021-05-23 16:46:26 +02:00 · 2021-05-23 16:46:26 +02:00 · 4670bdae73
commit 4670bdae73
parent 3bdfedb1d2
17 changed files with 363 additions and 35 deletions
--- a/0manifesto.html
+++ b/0manifesto.html
@ -0,0 +1,34 @@
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>cocoatlas</title>
+        <meta name="description" content="test">
+        <meta name="keywords" content="chocolate, cocoa">
+        <meta name="viewport" content="minimal-ui, width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
+        
+        <link rel="stylesheet" href="styles.css">
+
+        <script src="js/jquery-3.6.0.min.js"></script>
+        <script src="js/jquery-ui.min.js"></script>
+        <script src="js/application.js"></script>
+
+    </head>
+    <body>
+
+        <div class="thoughtsWindows">
+            <div class="april">
+                <div class="entête">
+                    <div class="titre"></div>
+                    <div class="date">April 27th 2021</div>
+                </div>
+                <div class="texte">After weeks of discomfort and uncertainty about the ins and outs of this project, and what was asked of us as designers, from the Netherlands Food Partnership or the United Nations, and the feeling of a disconnect with reality, I would like to propose a catalog of non-solutions. Through the demonstration of the complexity of the cocoa and chocolate industry, I would also like to question the foundations of the subject on which we were asked to work. The underlying issues; our position as designers, the management of systemic problems by a demand for local solutions (solutions that are demanded by institutions such as the UN with a systemic scope), and what questions this relationship of requesting local and individual solutions in a global system raises.
+                    This catalog will not show any solutions on my part, I want to question and criticize a solutionist system to which design is entirely part.
+                </div>
+            </div>
+        </div>
+       
+    </body>
+</html>
--- a/1beantobar.html
+++ b/1beantobar.html
@ -0,0 +1,66 @@
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>cocoatlas</title>
+        <meta name="description" content="test">
+        <meta name="keywords" content="chocolate, cocoa">
+        <meta name="viewport" content="minimal-ui, width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
+        
+        <link rel="stylesheet" href="styles.css">
+
+        <script src="js/jquery-3.6.0.min.js"></script>
+        <script src="js/jquery-ui.min.js"></script>
+        <script src="js/application.js"></script>
+
+    </head>
+    <body>
+
+        <div class="object">
+            <img src="ImgCamille.png"/>
+            <a href="PageProtocol.jpg"></a>
+            <p>Harkin-Engel Protocol</p>
+        </div>
+
+        <div class="object">
+            <img src="ImgLison.png"/>
+            <a href="PageLison.pdf"></a>
+            <p>Packaging</p>
+        </div>
+
+        <div class="object">
+            <img src="ImgRaphaelle.png"/>
+            <a href="PageRaphaelle.jpg"></a>
+            <p>Local Dish</p>
+        </div>
+
+        <div class="object">
+            <img src="ImgJuli.png"/>
+            <a href="PageJuli.pdf"></a>
+            <p>Manioc</p>
+        </div>
+
+        <!-- <div class="object">
+            <img src="ImgProtocol.png"/>
+            <a href="PageProtocol.jpg"></a>
+        </div> -->
+
+        <div class=landingPage>
+            <h1>Chocolate Atlas</h1>
+            The Chocolate Atlas takes the viewer on a non-liner route through the world of cocoa. Using
+                the lens of cocoa to magnify the detached consumption of goods on a global base. A melt-inyour-mouth sweet for some and, amongst others, a child-slavery-based business for others. The
+                reality of food is not singular, which is why the Atlas is organized in an organic spread that can
+                be accessed at multiple points. Cocoa and its trade route is one of the most fragmented crops of
+                the world, equaling in increased accountability detachment from the fruit to the bar.
+                <p>Project Developed
+                at Design Academy of Eindhoven
+               <br>Curated and edited
+               by Lison, Julia, Camille, Raphaelle, Gianmarco</p>
+            <div class=buttonEnter>enter</div>
+        </div>
+
+       
+    </body>
+</html>
--- a/2harkinengel.html
+++ b/2harkinengel.html
@ -0,0 +1,25 @@
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>cocoatlas</title>
+        <meta name="description" content="test">
+        <meta name="keywords" content="chocolate, cocoa">
+        <meta name="viewport" content="minimal-ui, width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
+        
+        <link rel="stylesheet" href="styles.css">
+
+        <script src="js/jquery-3.6.0.min.js"></script>
+        <script src="js/jquery-ui.min.js"></script>
+        <script src="js/application.js"></script>
+
+    </head>
+    <body>
+
+
+
+       
+    </body>
+</html>
--- a/Img0Camille.jpg
+++ b/Img0Camille.jpg
--- a/ImgCamille.png
+++ b/ImgCamille.png
--- a/fonts/HelveticaLTStd-Obl.otf
+++ b/fonts/HelveticaLTStd-Obl.otf
--- a/fonts/MAZIUSREVIEW20.09-Extraitalic.otf
+++ b/fonts/MAZIUSREVIEW20.09-Extraitalic.otf
--- a/fonts/MigraItalic-ExtralightItalic.otf
+++ b/fonts/MigraItalic-ExtralightItalic.otf
--- a/fonts/happy-times-NG_italic_master.otf
+++ b/fonts/happy-times-NG_italic_master.otf
--- a/fonts/happy-times-NG_regular_master.otf
+++ b/fonts/happy-times-NG_regular_master.otf
--- a/index.html
+++ b/index.html
@ -16,11 +16,11 @@
        <script src="js/application.js"></script>

    </head>
-    <body>
+    <body class="home">

        <div class="object">
            <img src="ImgProtocol.png"/>
-            <a href="PageProtocol.jpg"></a>
+            <a href="2harkinengel.html"></a>
            <p>Harkin-Engel Protocol</p>
        </div>

@ -42,12 +42,17 @@
            <p>Manioc</p>
        </div>

-        <!-- <div class="object">
-            <img src="ImgProtocol.png"/>
-            <a href="PageProtocol.jpg"></a>
-        </div> -->
+        <div class="object">
+            <img src="Img0Camille.jpg"/>
+            <a href="0manifesto.html"></a>
+            <p>0. thoughts</p>
+        </div>

-        <div class=landingPage>
+        <div class="menu">
+            <a href="landingPage.html"><div class=buttonAboutus>about us</div></a>
+        </div>
+
+        <!-- <div class=landingPage>
            <h1>Chocolate Atlas</h1>
            The Chocolate Atlas takes the viewer on a non-liner route through the world of cocoa. Using
                the lens of cocoa to magnify the detached consumption of goods on a global base. A melt-inyour-mouth sweet for some and, amongst others, a child-slavery-based business for others. The
@ -59,7 +64,7 @@
               <br>Curated and edited
               by Lison, Julia, Camille, Raphaelle, Gianmarco</p>
            <div class=buttonEnter>enter</div>
-        </div>
+        </div> -->

       
    </body>
--- a/js/application.js
+++ b/js/application.js
@ -7,6 +7,13 @@ $(document).ready(function(){
        }
    });

+    $(".thoughtsWindows").draggable({
+        start: function(){
+            $(".thoughtsWindows").css({"z-index": 0});
+            $(this).css({"z-index": 100});
+        }
+    });
+
    function nombre(value){
        return  Math.floor(Math.random() * value);
    }
--- a/landingPage.html
+++ b/landingPage.html
@ -0,0 +1,38 @@
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>cocoatlas</title>
+        <meta name="description" content="test">
+        <meta name="keywords" content="chocolate, cocoa">
+        <meta name="viewport" content="minimal-ui, width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
+        
+        <link rel="stylesheet" href="styles.css">
+
+        <script src="js/jquery-3.6.0.min.js"></script>
+        <script src="js/jquery-ui.min.js"></script>
+        <script src="js/application.js"></script>
+
+    </head>
+    <body class="home">
+
+
+        <div class=landingPage>
+            <h1>Chocolate Atlas</h1>
+            The Chocolate Atlas takes the viewer on a non-liner route through the world of cocoa. Using
+                the lens of cocoa to magnify the detached consumption of goods on a global base. A melt-inyour-mouth sweet for some and, amongst others, a child-slavery-based business for others. The
+                reality of food is not singular, which is why the Atlas is organized in an organic spread that can
+                be accessed at multiple points. Cocoa and its trade route is one of the most fragmented crops of
+                the world, equaling in increased accountability detachment from the fruit to the bar.
+                <p>Project Developed
+                at Design Academy of Eindhoven
+               <br>Curated and edited
+               by Lison, Julia, Camille, Raphaelle, Gianmarco</p>
+            <a href="index.html"><div class=buttonEnter>enter</div></a>
+        </div>
+
+       
+    </body>
+</html>
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 3bdfedb1d2aafb12b86e05f16de1fce151456883
--- a/styles.css
+++ b/styles.css
@ -1,3 +1,4 @@
+@charset "UTF-8";
 * {
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
@ -17,8 +18,13 @@
 }

@font-face {
-  font-family: 'Migra';
-  src: url("fonts/MigraItalic-ExtralightItalic.otf") format("opentype");
+  font-family: 'HelveticaOblique';
+  src: url("fonts/HelveticaLTStd-Obl.otf") format("opentype");
+}
+
+@font-face {
+  font-family: 'HappyTimes';
+  src: url("fonts/happy-times-NG_regular_master.otf") format("opentype");
 }

 html {
@ -26,7 +32,7 @@ html {
  overflow: hidden;
 }

-body {
+.home {
  margin: 0;
  padding: 0;
  background: black;
@ -39,9 +45,38 @@ body {
  overflow: hidden;
 }

+body {
+  margin: 0;
+  padding: 0;
+  background: black;
+}
+
+.menu {
+  font-family: Helvetica;
+  font-size: 9pt;
+  font-weight: normal;
+}
+
+.menu .buttonAboutus {
+  background: black;
+  color: white;
+  display: inline-block;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 3vw;
+  border-color: white;
+  padding: 0.5vw 1vw 0.5vw 1vw;
+  cursor: pointer;
+}
+
+.menu .buttonAboutus:hover {
+  background: white;
+  color: black;
+}
+
 .object {
  position: absolute;
-  width: 10%;
+  width: 10vw;
  cursor: move;
  color: white;
  text-align: center;
@ -120,27 +155,65 @@ body {
 }

 .object:nth-child(1) {
-  left: 70%;
-  top: 45%;
-}
-
-.object:nth-child(2) {
-  left: 1%;
-  top: 64%;
-}
-
-.object:nth-child(3) {
-  left: 68%;
+  left: 69%;
  top: 34%;
 }

+.object:nth-child(2) {
+  left: 22%;
+  top: 24%;
+}
+
+.object:nth-child(3) {
+  left: 38%;
+  top: 54%;
+}
+
 .object:nth-child(4) {
-  left: 21%;
-  top: 73%;
+  left: 30%;
+  top: 25%;
 }

 .object:nth-child(5) {
-  left: 1%;
-  top: 8%;
+  left: 56%;
+  top: 66%;
+}
+
+.april {
+  width: 30%;
+  position: absolute;
+  top: 20vw;
+  right: 20vw;
+  overflow: hidden;
+}
+
+.thoughtsWindows {
+  font-family: Helvetica;
+  font-size: 11pt;
+  font-weight: normal;
+}
+
+.thoughtsWindows .entête {
+  text-transform: uppercase;
+  font-size: 10pt;
+  background: black;
+  border-width: 1px;
+  border-style: solid;
+  color: white;
+  padding: 3px;
+}
+
+.thoughtsWindows .entête .titre {
+  text-align: left;
+}
+
+.thoughtsWindows .entête .date {
+  text-align: right;
+}
+
+.thoughtsWindows .texte {
+  font-family: HelveticaOblique;
+  background: white;
+  padding: 20px;
 }
 /*# sourceMappingURL=styles.css.map */
--- a/styles.css.map
+++ b/styles.css.map
@ -1,6 +1,6 @@
 {
    "version": 3,
-    "mappings": "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",
+    "mappings": "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",
    "sources": [
        "styles.scss"
    ],
--- a/styles.scss
+++ b/styles.scss
@ -18,16 +18,26 @@
 }

@font-face {
-    font-family: 'Migra';
-    src:    url('fonts/MigraItalic-ExtralightItalic.otf') format('opentype');
+    font-family: 'HelveticaOblique';
+    src:    url('fonts/HelveticaLTStd-Obl.otf') format('opentype');
 }

+@font-face {
+    font-family: 'HappyTimes';
+    src:    url('fonts/happy-times-NG_regular_master.otf') format('opentype');
+}
+
+// @font-face {
+//     font-family: 'Migra';
+//     src:    url('fonts/MigraItalic-ExtralightItalic.otf') format('opentype');
+// }
+
 html{
    height: 100%;
    overflow: hidden;
 }

-body {
+.home{
    margin: 0;
    padding: 0;
    background: black;
@ -40,9 +50,38 @@ body {
    overflow: hidden;
 }

+body{
+    margin: 0;
+    padding: 0;
+    background: black;
+}
+
+.menu {
+    font-family: Helvetica;
+    font-size: 9pt;
+    font-weight: normal;
+
+    .buttonAboutus{
+        background: rgb(0, 0, 0);
+        color: rgb(255, 255, 255);
+        display: inline-block;
+        border-width: 1px;
+        border-style: solid;
+        border-radius:3vw;
+        border-color: white;
+        padding: 0.5vw 1vw 0.5vw 1vw;
+        cursor: pointer;
+
+        &:hover {
+            background: rgb(255, 255, 255);
+            color: rgb(0, 0, 0);
+        }
+    }
+}
+
 .object {
    position: absolute;
-    width: 10%;
+    width: 10vw;
    cursor: move;
    color: white;
    text-align: center;
@ -125,11 +164,52 @@ body {

@for $i from 1 through 5 {
    .object:nth-child(#{$i}){
-        left: random(90) + %;
-        top: random(90) + %;
+        left: random(90) + % ;
+        top: random(90) + % ;
    }
 }

+.april{
+    width: 30%;
+    position: absolute;
+    top: 20vw;
+    right: 20vw;
+    overflow: hidden;
+}
+
+.thoughtsWindows{
+    font-family: Helvetica;
+    font-size: 11pt;
+    font-weight: normal;
+    // cursor: move;
+
+    .entête{
+        text-transform: uppercase;
+        font-size: 10pt;
+        background: black;
+        border-width: 1px;
+        border-style: solid;
+        color: white;
+        padding: 3px;
+
+
+        .titre{
+            text-align: left;
+        }
+        .date{
+            text-align: right;
+        }
+    }
+
+    .texte{
+        font-family: HelveticaOblique;
+        background: white;
+        padding: 20px;
+    }
+
+}
+
+
@media screen and (min-width: 1000px) {

    
@ -139,4 +219,3 @@ body {
 

 }
-
				`@ -0,0 +1 @@`
				`Subproject commit 3bdfedb1d2aafb12b86e05f16de1fce151456883`