diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2017-08-23 21:00:39 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2017-08-23 21:00:39 +0200 |
| commit | 367f74eea99c8e46cba7f08efe5fe3e6d3f51179 (patch) | |
| tree | 0c799532bcc953a6d5f1ec6f2e5b247eb81cf668 | |
| parent | 0e494854248bb5b76839fa9c73b07f5e864248a4 (diff) | |
merge
| -rw-r--r-- | acknowledgements | 21 | ||||
| -rw-r--r-- | public/assets/css.css | 12 | ||||
| -rw-r--r-- | templates/index.liquid | 36 |
3 files changed, 18 insertions, 51 deletions
diff --git a/acknowledgements b/acknowledgements index c976ee5..30931b5 100644 --- a/acknowledgements +++ b/acknowledgements @@ -7,22 +7,21 @@ <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! + <h3>This project is supported entirely by the collaboration TUA x CSM</h3> + During the second collaboration between the Tokyo University of Fine Arts and Music + and Central Saint Martins of the London University of Arts, we are proud to be participating + in a Folkestone Triennial event! + <br> + <br> 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. + 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/public/assets/css.css b/public/assets/css.css index 8a6c7c9..20e8056 100644 --- a/public/assets/css.css +++ b/public/assets/css.css @@ -1,9 +1,11 @@ -html,body { - padding: 0; - margin: 0; +* { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; +} +html,body { + padding: 0; + margin: 0; font-family: sans-serif; font-weight: 300; text-align: center; @@ -23,7 +25,7 @@ a { width: 100%; margin: 0; background: #fff; - padding: 10px; + padding: 10px 0; box-shadow: 0 5px 10px #ddd; } @@ -35,7 +37,7 @@ a { width: 100%; margin: 0; background: #fff; - padding: 10px; + padding: 10px 0; margin-top: 15px; box-shadow: 0 -5px 10px #ddd; } diff --git a/templates/index.liquid b/templates/index.liquid index e554ac9..46ed396 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -7,28 +7,14 @@ </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 }}'> @@ -38,26 +24,7 @@ </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 %} @@ -94,10 +61,9 @@ <div id="footer"> How to make a Folkestone.<br> - Tokyo University of the Arts<br> Central Saint Martins - + <a href="http://howtomakeafolkestone.life/acknowledgements">Acknowledgements</a> </div> </body> |