From 367f74eea99c8e46cba7f08efe5fe3e6d3f51179 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 23 Aug 2017 21:00:39 +0200 Subject: merge --- acknowledgements | 21 ++++++++++----------- public/assets/css.css | 12 +++++++----- 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 @@

How to make a Folkestone.

Acknowledgements

-

-

This project is supported entirely by the collaboration TUA x CSM

-

- 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! +

This project is supported entirely by the collaboration TUA x CSM

+ 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! +
+
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. -

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 - -======= ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990
- -======= - -
- ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990

- {% for entry in entries %} {% unless entry.disabled %}

@@ -38,26 +24,7 @@

{% endunless %} {% endfor %} -<<<<<<< HEAD - -

- - - - - -======= ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990 {% for page in pages %} {% unless page.disabled %} @@ -94,10 +61,9 @@ -- cgit v1.2.3-70-g09d2

How to make a Folkestone.

Acknowledgements

This project is supported entirely by the collaboration TUA x CSM

This project is supported entirely by the collaboration TUA x CSM

How to make a Folkestone.

Participate!