diff --git a/css/style.css b/css/style.css index dfd189e..94dea93 100644 --- a/css/style.css +++ b/css/style.css @@ -2,45 +2,26 @@ /* FONTS /*--------------------------------------------------------*/ -/* roboto-300 - latin */ +/* palanquin-regular - latin */ @font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), - url('../fonts/roboto-v18-latin-300.woff2') format('woff2'), - url('../fonts/roboto-v18-latin-300.woff') format('woff'); -} - -/* roboto-regular - latin */ -@font-face { - font-family: 'Roboto'; + font-family: 'Palanquin'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), - url('../fonts/roboto-v18-latin-regular.woff2') format('woff2'), - url('../fonts/roboto-v18-latin-regular.woff') format('woff'); -} - -/* roboto-italic - latin */ -@font-face { - font-family: 'Roboto'; - font-style: italic; - font-weight: 400; - src: local('Roboto Italic'), local('Roboto-Italic'), - url('../fonts/roboto-v18-latin-italic.woff2') format('woff2'), - url('../fonts/roboto-v18-latin-italic.woff') format('woff'); -} - -/* roboto-700 - latin */ -@font-face { - font-family: 'Roboto'; + src: local('Palanquin Regular'), local('Palanquin-Regular'), + url('../fonts/palanquin-v4-latin-regular.woff2') format('woff2'), + url('../fonts/palanquin-v4-latin-regular.woff') format('woff'); + } + + /* palanquin-600 - latin */ + @font-face { + font-family: 'Palanquin'; font-style: normal; - font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), - url('../fonts/roboto-v18-latin-700.woff2') format('woff2'), - url('../fonts/roboto-v18-latin-700.woff') format('woff'); -} + font-weight: 600; + src: local('Palanquin SemiBold'), local('Palanquin-SemiBold'), + url('../fonts/palanquin-v4-latin-600.woff2') format('woff2'), + url('../fonts/palanquin-v4-latin-600.woff') format('woff'); + } + /* oleo-script-regular - latin */ @font-face { @@ -51,17 +32,6 @@ url('../fonts/oleo-script-v7-latin-regular.woff2') format('woff2'), url('../fonts/oleo-script-v7-latin-regular.woff') format('woff'); } - - /* oleo-script-700 - latin */ - @font-face { - font-family: 'Oleo Script'; - font-style: normal; - font-weight: 700; - src: local('Oleo Script Bold'), local('OleoScript-Bold'), - url('../fonts/oleo-script-v7-latin-700.woff2') format('woff2'), - url('../fonts/oleo-script-v7-latin-700.woff') format('woff'); - } - @@ -78,9 +48,8 @@ } html, body { - font-family: "Roboto", serif; - font-weight: 300; - line-height: 180%; + font-family: "Palanquin", sans-serif; + font-weight: 400; color: #000000; font-size: 18px; } @@ -207,41 +176,56 @@ section { padding: 0 60px; text-align: justify; + line-height: 180%; } section h2 { margin: 0 0 25px 0; - padding: 15px 0; + padding: 20px 0; + + /* + background-image: url("../img/header/background.jpg"); + -webkit-background-clip: text; + background-clip: text; + color: transparent !important; + */ + + border-bottom-width: 5px; + border-bottom-style: solid; color: #FFFFFF; - font-family: "Oleo script", "Roboto", sans-serif; + font-family: "Oleo script", sans-serif; font-size: 4rem; - font-weight: 300; + font-weight: 400; text-align: center; word-wrap: break-word; hyphens: none; } /*section.red { color: #803339; }*/ -section.red h2 { color: #FF6673; } +section.red h2 { color: #EA6C61; border-bottom-color: #f7cbc0; } /* section.orange { color: #805333; } */ -section.orange h2 { color: #FFA666; } +section.orange h2 { color: #ebaa5b; border-bottom-color: #f8dfc2; } /* section.green { color: #5A8039; } */ -section.green h2 { color: #A2E667; } +section.green h2 { color: #5fb574; border-bottom-color: #cae2cb; } /* section.blue { color: #396680; } */ -section.blue h2 { color: #73CCFF; } +section.blue h2 { color: #2896ce; border-bottom-color: #bcd4ec; } /* section.purple { color: #80396E; } */ -section.purple h2 { color: #FF73DC; }, +section.purple h2 { color: #e4678c; border-bottom-color: #f3cad2; } section p { padding: 0 0 20px 0; font-size: 1rem; } +section strong { + font-weight: 700; +} + section p.stand-out { font-style: italic; text-align: center; @@ -260,6 +244,10 @@ section p.stand-out { } section h2 { + padding: 15px 0; + + border-bottom-width: 4px; + font-size: 3rem; } } @@ -267,11 +255,15 @@ section p.stand-out { @media only screen and (max-width: 480px) { section { padding: 0 30px; + + line-height: 150%; } } @media only screen and (max-width: 360px) { section h2 { + padding: 5px 0; + font-size: 2.2rem; } } @@ -288,13 +280,13 @@ section p.stand-out { margin: 20px auto 0 auto; padding: 15px 20px; - background-color: rgba(255, 102, 115, 0.1); + background-color: #fce8e2; - border: 2px solid #FF6673; + border: 2px solid #EA6C61; - color: #FF6673; + color: #EA6C61; font-size: 1.4rem; - font-weight: 400; + font-weight: 700; text-transform: uppercase; text-align: center; @@ -302,7 +294,7 @@ section p.stand-out { } .button:hover { - background-color: rgba(255, 102, 115, 0.2); + background-color: #fadad0 ; } .button img { @@ -376,7 +368,7 @@ section p.stand-out { margin: 0 0 0 -100px; font-size: 1.5rem; - font-weight: 300; + font-weight: 400; line-height: 48px; vertical-align: middle; @@ -535,23 +527,19 @@ section p.stand-out { margin: 20px; } -#sponsors img.sponsor-disc { - height: 155px; -} - - /*--------------------------------------------------------*/ +@media only screen and (max-width: 880px) { + #sponsors img { + display: block; + + margin: 10px auto; + } +} @media only screen and (max-width: 480px) { #sponsors img { - height: 40px; - - margin: 5px; - } - - #sponsors img.sponsor-disc { - height: 60px; + height: 80px; } } @@ -580,10 +568,16 @@ section p.stand-out { /*--------------------------------------------------------*/ +@media only screen and (max-width: 880px) { + #contact-email { + font-size: 1.2rem; + } +} + @media only screen and (max-width: 480px) { #contact-email { - font-size: 0.9rem; + font-size: 1rem; } #contact-email img { diff --git a/fonts/palanquin-v4-latin-600.woff b/fonts/palanquin-v4-latin-600.woff new file mode 100644 index 0000000..6729ea1 Binary files /dev/null and b/fonts/palanquin-v4-latin-600.woff differ diff --git a/fonts/palanquin-v4-latin-600.woff2 b/fonts/palanquin-v4-latin-600.woff2 new file mode 100644 index 0000000..1b80557 Binary files /dev/null and b/fonts/palanquin-v4-latin-600.woff2 differ diff --git a/fonts/palanquin-v4-latin-regular.woff b/fonts/palanquin-v4-latin-regular.woff new file mode 100644 index 0000000..1e7df66 Binary files /dev/null and b/fonts/palanquin-v4-latin-regular.woff differ diff --git a/fonts/palanquin-v4-latin-regular.woff2 b/fonts/palanquin-v4-latin-regular.woff2 new file mode 100644 index 0000000..a49c430 Binary files /dev/null and b/fonts/palanquin-v4-latin-regular.woff2 differ diff --git a/fonts/oleo-script-v7-latin-700.woff b/fonts/useless/oleo-script-v7-latin-700.woff similarity index 100% rename from fonts/oleo-script-v7-latin-700.woff rename to fonts/useless/oleo-script-v7-latin-700.woff diff --git a/fonts/oleo-script-v7-latin-700.woff2 b/fonts/useless/oleo-script-v7-latin-700.woff2 similarity index 100% rename from fonts/oleo-script-v7-latin-700.woff2 rename to fonts/useless/oleo-script-v7-latin-700.woff2 diff --git a/fonts/roboto-v18-latin-300.woff b/fonts/useless/roboto-v18-latin-300.woff similarity index 100% rename from fonts/roboto-v18-latin-300.woff rename to fonts/useless/roboto-v18-latin-300.woff diff --git a/fonts/roboto-v18-latin-300.woff2 b/fonts/useless/roboto-v18-latin-300.woff2 similarity index 100% rename from fonts/roboto-v18-latin-300.woff2 rename to fonts/useless/roboto-v18-latin-300.woff2 diff --git a/fonts/roboto-v18-latin-700.woff b/fonts/useless/roboto-v18-latin-700.woff similarity index 100% rename from fonts/roboto-v18-latin-700.woff rename to fonts/useless/roboto-v18-latin-700.woff diff --git a/fonts/roboto-v18-latin-700.woff2 b/fonts/useless/roboto-v18-latin-700.woff2 similarity index 100% rename from fonts/roboto-v18-latin-700.woff2 rename to fonts/useless/roboto-v18-latin-700.woff2 diff --git a/fonts/roboto-v18-latin-italic.woff b/fonts/useless/roboto-v18-latin-italic.woff similarity index 100% rename from fonts/roboto-v18-latin-italic.woff rename to fonts/useless/roboto-v18-latin-italic.woff diff --git a/fonts/roboto-v18-latin-italic.woff2 b/fonts/useless/roboto-v18-latin-italic.woff2 similarity index 100% rename from fonts/roboto-v18-latin-italic.woff2 rename to fonts/useless/roboto-v18-latin-italic.woff2 diff --git a/fonts/roboto-v18-latin-regular.woff b/fonts/useless/roboto-v18-latin-regular.woff similarity index 100% rename from fonts/roboto-v18-latin-regular.woff rename to fonts/useless/roboto-v18-latin-regular.woff diff --git a/fonts/roboto-v18-latin-regular.woff2 b/fonts/useless/roboto-v18-latin-regular.woff2 similarity index 100% rename from fonts/roboto-v18-latin-regular.woff2 rename to fonts/useless/roboto-v18-latin-regular.woff2 diff --git a/img/header/background.jpg b/img/header/background.jpg index c7a7845..2f68d3e 100644 Binary files a/img/header/background.jpg and b/img/header/background.jpg differ diff --git a/img/icons/email.svg b/img/icons/email.svg index 1945779..2a6c171 100644 --- a/img/icons/email.svg +++ b/img/icons/email.svg @@ -1,10 +1,9 @@ - - - + + diff --git a/img/icons/facebook.svg b/img/icons/facebook.svg index 859e407..94a542b 100644 --- a/img/icons/facebook.svg +++ b/img/icons/facebook.svg @@ -1,23 +1,22 @@ - - + + - + diff --git a/img/icons/location.svg b/img/icons/location.svg index 97e1b22..7035d24 100644 --- a/img/icons/location.svg +++ b/img/icons/location.svg @@ -1,10 +1,9 @@ - - + + - diff --git a/img/icons/ticket.svg b/img/icons/ticket.svg deleted file mode 100644 index 37b5847..0000000 --- a/img/icons/ticket.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/img/sponsors/a-ulm.png b/img/sponsors/a-ulm.png index b7b74b3..fc5ea2c 100644 Binary files a/img/sponsors/a-ulm.png and b/img/sponsors/a-ulm.png differ diff --git a/img/sponsors/bda.png b/img/sponsors/bda.png new file mode 100644 index 0000000..9170b06 Binary files /dev/null and b/img/sponsors/bda.png differ diff --git a/img/sponsors/cof.png b/img/sponsors/cof.png index 86d1981..0344f4b 100644 Binary files a/img/sponsors/cof.png and b/img/sponsors/cof.png differ diff --git a/img/sponsors/ens-psl.png b/img/sponsors/ens-psl.png new file mode 100644 index 0000000..20ce7a1 Binary files /dev/null and b/img/sponsors/ens-psl.png differ diff --git a/img/sponsors/mgen.jpg b/img/sponsors/mgen.jpg deleted file mode 100644 index 63a55ba..0000000 Binary files a/img/sponsors/mgen.jpg and /dev/null differ diff --git a/img/sponsors/pls.png b/img/sponsors/pls.png new file mode 100644 index 0000000..07312cc Binary files /dev/null and b/img/sponsors/pls.png differ diff --git a/img/sponsors/soge.svg b/img/sponsors/soge.svg deleted file mode 100644 index 86b8271..0000000 --- a/img/sponsors/soge.svg +++ /dev/null @@ -1,140 +0,0 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/img/sponsors/useless/a-ulm.png b/img/sponsors/useless/a-ulm.png new file mode 100644 index 0000000..b7b74b3 Binary files /dev/null and b/img/sponsors/useless/a-ulm.png differ diff --git a/img/sponsors/useless/cof.pdf b/img/sponsors/useless/cof.pdf new file mode 100644 index 0000000..d9ae0ee Binary files /dev/null and b/img/sponsors/useless/cof.pdf differ diff --git a/img/sponsors/useless/cof.png b/img/sponsors/useless/cof.png new file mode 100644 index 0000000..86d1981 Binary files /dev/null and b/img/sponsors/useless/cof.png differ diff --git a/img/sponsors/ens.png b/img/sponsors/useless/ens.png similarity index 100% rename from img/sponsors/ens.png rename to img/sponsors/useless/ens.png diff --git a/img/sponsors/useless/pls.pdf b/img/sponsors/useless/pls.pdf new file mode 100644 index 0000000..caad88f Binary files /dev/null and b/img/sponsors/useless/pls.pdf differ diff --git a/img/sponsors/soge2.svg b/img/sponsors/useless/soge2.svg similarity index 100% rename from img/sponsors/soge2.svg rename to img/sponsors/useless/soge2.svg diff --git a/index.html b/index.html index 2d9503a..a8affc4 100644 --- a/index.html +++ b/index.html @@ -23,10 +23,11 @@

Présentation

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc aliquam elit in elit lobortis finibus. Mauris a sapien sagittis, ultricies eros ac, faucibus quam. Aliquam ac vulputate purus. Donec consequat sodales sem, eu elementum nunc tempus ut. Aliquam tortor neque, auctor sed consectetur quis, tincidunt ut ipsum. Etiam lobortis diam scelerisque, cursus libero eget, varius est. Interdum et malesuada fames ac ante ipsum primis in faucibus. Vestibulum auctor nec velit id blandit. Vestibulum tincidunt neque facilisis arcu porta pretium. Integer interdum nisi eu elementum pharetra. Praesent convallis pellentesque lorem ac porta. Etiam a orci feugiat, tempor tortor pellentesque, malesuada urna. Etiam vitae tincidunt elit. Integer sodales magna ligula, eget scelerisque dui aliquam nec.

- -

Vivamus convallis venenatis ipsum, vel euismod ante consequat ullamcorper. Sed erat lorem, pharetra at sem in, luctus suscipit arcu. Vivamus pharetra fermentum sem, a tempus mi placerat ac. Aenean quis quam ac mauris vehicula viverra id a ex. Fusce in diam commodo urna porttitor porta. Fusce sagittis ipsum at lectus suscipit viverra. Quisque fringilla, dolor sed porta semper, diam orci tincidunt ipsum, et elementum tortor augue non lacus. Duis vel facilisis elit, at eleifend quam. Vestibulum elementum luctus mi nec sodales. Proin dictum lectus sed ligula maximus ullamcorper. In bibendum commodo leo, vitae varius justo auctor in. Mauris in lectus ultricies, pretium tellus volutpat, accumsan quam. Curabitur suscipit augue sit amet ultricies vestibulum. Suspendisse ex ex, auctor ac turpis a, facilisis gravida sem.

- +

+ Les 48h des Arts sont un festival culturel et artistique gratuit organisé du 3 au 5 mai 2019 par le Bureau des Arts de l'ENS et des membres de plusieurs écoles de PSL au 45 rue d'Ulm. + Il rassemble des projets artistiques d'une grande diversité autour du thème "Ruptures" : théâtre, concerts, cinéma, arts martiaux, danse, photographie, arts plastiques et bien d'autres encore. + À cette occasion, l'ENS ouvre ses bâtiments historiques au public et accueille les habitant·e·s du quartier ainsi que tou·te·s celles et ceux qui souhaitent s'y rendre. +

Facebook @@ -440,19 +441,20 @@ - - + + - - + +
- - MGEN + + + a-Ulm - - Société Générale + + ENS-PSL
diff --git a/js/triangles-mask.js b/js/triangles-mask.js index fbd6218..f709040 100644 --- a/js/triangles-mask.js +++ b/js/triangles-mask.js @@ -11,7 +11,7 @@ // Define some useful constants - const DELAY_BETWEEN_CANVAS_UPDATES = 50; // ms + const POSITIONS_UPDATE_DELAY = 50; // ms const NB_POINTS_PER_ROW = 4 + Math.round(WIDTH / 250); const NB_POINTS_PER_COL = 5; @@ -19,16 +19,16 @@ const INIT_ROW_SPACING = HEIGHT / (NB_POINTS_PER_COL - 1); const INIT_COL_SPACING = WIDTH / (NB_POINTS_PER_ROW - 3); - const X_ORIGIN = -INIT_COL_SPACING * 2; - const Y_ORIGIN = -150; + const X_ORIGIN = -INIT_COL_SPACING; + const Y_ORIGIN = -100; // When creating points - const INIT_MAX_X_SHIFT_DISTANCE = INIT_ROW_SPACING / 3.5; - const INIT_MAX_Y_SHIFT_ISTANCE = INIT_COL_SPACING / 3.5; + const INIT_MAX_X_SHIFT_DISTANCE = INIT_ROW_SPACING / 3; + const INIT_MAX_Y_SHIFT_ISTANCE = INIT_COL_SPACING / 4; // Set the drawing style - context.lineWidth = 4; + context.lineWidth = 3; // Create a grid of points @@ -174,16 +174,16 @@ //console.log(direction, speed, xRadius, yRadius) - point.x += direction.x * Math.cos(positionUpdateIter * speed.x / 10) * radius.x - + (Math.random() * 4) - 2; - point.y += direction.y * Math.sin(positionUpdateIter * speed.y / 10) * radius.y - + (Math.random() * 4) - 2; + point.x += direction.x * Math.cos(positionUpdateIter * speed.x / 10) * radius.x; + //+ (Math.random() * 4) - 2; + point.y += direction.y * Math.sin(positionUpdateIter * speed.y / 10) * radius.y; + //+ (Math.random() * 4) - 2; } positionUpdateIter++; } - setInterval(updatePointPositions, DELAY_BETWEEN_CANVAS_UPDATES); + setInterval(updatePointPositions, POSITIONS_UPDATE_DELAY); // Update the drawing