diff options
| -rw-r--r-- | acknowledgements | 28 | ||||
| -rw-r--r-- | templates/index.liquid | 33 |
2 files changed, 61 insertions, 0 deletions
diff --git a/acknowledgements b/acknowledgements new file mode 100644 index 0000000..c976ee5 --- /dev/null +++ b/acknowledgements @@ -0,0 +1,28 @@ +<!doctype html> +<html> +<head> +<title>How to make a Folkestone.</title> +<link href='/assets/css.css' rel='stylesheet' type='text/css'> +</head> +<body> +<div id='header'> + <center> + <h1>How to make a Folkestone.</h1> + <br></br> + <h2>Acknowledgements</h2> + <br></br> + <h3> This project is supported entirely by the collaboration TUA x CSM </h3> + <br></br> + During the second collaboration between the Tokyo University of Fine Arts and Music + and Central Sain Martins of the London University of Arts, we are proud to be participating + in a Folkestone Triennial event! + + For the time of installation and exhibition in Folkestone we have been assigned to + think of the idea of Topography, and to manifest artwork that will engage the people of + Folkestone, the visitors to the triennale, and the artists in a way that is + relevant to our global community of Art enthusiasts. + + + </center> +</div> +<br> diff --git a/templates/index.liquid b/templates/index.liquid index 2bc3a92..e554ac9 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -7,14 +7,28 @@ </head> <body> +<<<<<<< HEAD + +======= +>>>>>>> eddee7c150388106979c16221b3ee106e53b1990 <div id='header'> + <center> <h1>How to make a Folkestone.</h1> <a href="https://docs.google.com/forms/d/10dqrK_3UZW_xlPWQLERd0xTwVONryyicNuz2aYz3X_I/edit?c=0&w=1"><h2>Participate!</h2></a> <div id='tags'></div> +<<<<<<< HEAD + </center> </div> <br> + +======= +</div> +<br> + +>>>>>>> eddee7c150388106979c16221b3ee106e53b1990 <div id='body'> + <center> {% for entry in entries %} {% unless entry.disabled %} <div class='cell' data-id='{{ entry.id }}'> @@ -24,7 +38,26 @@ </div> {% endunless %} {% endfor %} +<<<<<<< HEAD + </center> +</div> + +<center> +<div id='footer'> + + <div class='cell' data-id='{{ testimonial.id }}'> + </div> + <div class='cell' data-id='{{ developer.id }}'> + </div> + <a href="http://howtomakeafolkestone.life/acknowledgements"> + Acknowledgements</a> + +</div> +</center> + +======= </div> +>>>>>>> eddee7c150388106979c16221b3ee106e53b1990 {% for page in pages %} {% unless page.disabled %} |