add titles dates, correct parallax styles

This commit is contained in:
German Correa 2018-10-09 14:46:44 -03:00
parent c3797355e1
commit b0935a00f4
8 changed files with 129 additions and 63 deletions

169
composer.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "1812fa080861f1fd00320ca0ab0acdb8", "content-hash": "1812fa080861f1fd00320ca0ab0acdb8",
@ -39,28 +39,30 @@
}, },
{ {
"name": "google/recaptcha", "name": "google/recaptcha",
"version": "1.1.3", "version": "1.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/google/recaptcha.git", "url": "https://github.com/google/recaptcha.git",
"reference": "5a56d15ca10a7b75158178752b2ad8f755eb4f78" "reference": "e7add3be59211482ecdb942288f52da64a35f61a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/google/recaptcha/zipball/5a56d15ca10a7b75158178752b2ad8f755eb4f78", "url": "https://api.github.com/repos/google/recaptcha/zipball/e7add3be59211482ecdb942288f52da64a35f61a",
"reference": "5a56d15ca10a7b75158178752b2ad8f755eb4f78", "reference": "e7add3be59211482ecdb942288f52da64a35f61a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5" "php": ">=5.5"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8" "friendsofphp/php-cs-fixer": "^2.2.20|^2.12",
"php-coveralls/php-coveralls": "^2.1",
"phpunit/phpunit": "^4.8.36|^5.7.27|^6.59|^7"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.1.x-dev" "dev-master": "1.2.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -72,15 +74,15 @@
"license": [ "license": [
"BSD-3-Clause" "BSD-3-Clause"
], ],
"description": "Client library for reCAPTCHA, a free service that protect websites from spam and abuse.", "description": "Client library for reCAPTCHA, a free service that protects websites from spam and abuse.",
"homepage": "http://www.google.com/recaptcha/", "homepage": "https://www.google.com/recaptcha/",
"keywords": [ "keywords": [
"Abuse", "Abuse",
"captcha", "captcha",
"recaptcha", "recaptcha",
"spam" "spam"
], ],
"time": "2017-03-09T18:44:34+00:00" "time": "2018-08-05T09:31:53+00:00"
}, },
{ {
"name": "kanellov/slim-twig-flash", "name": "kanellov/slim-twig-flash",
@ -573,16 +575,16 @@
}, },
{ {
"name": "slim/slim", "name": "slim/slim",
"version": "3.10.0", "version": "3.11.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/slimphp/Slim.git", "url": "https://github.com/slimphp/Slim.git",
"reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748" "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/d8aabeacc3688b25e2f2dd2db91df91ec6fdd748", "url": "https://api.github.com/repos/slimphp/Slim/zipball/d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
"reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748", "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -640,7 +642,7 @@
"micro", "micro",
"router" "router"
], ],
"time": "2018-04-19T19:29:08+00:00" "time": "2018-09-16T10:54:21+00:00"
}, },
{ {
"name": "slim/twig-view", "name": "slim/twig-view",
@ -694,17 +696,75 @@
"time": "2018-05-07T10:54:29+00:00" "time": "2018-05-07T10:54:29+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-ctype",
"version": "v1.8.0", "version": "v1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "3296adf6a6454a050679cde90f95350ad604b171" "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
"reference": "3296adf6a6454a050679cde90f95350ad604b171", "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
"ext-ctype": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
},
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"ctype",
"polyfill",
"portable"
],
"time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
"reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -716,7 +776,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.8-dev" "dev-master": "1.9-dev"
} }
}, },
"autoload": { "autoload": {
@ -750,24 +810,25 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-04-26T10:06:28+00:00" "time": "2018-08-06T14:22:27+00:00"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v2.4.8", "version": "v2.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "7b604c89da162034bdf4bb66310f358d313dd16d" "reference": "6a5f676b77a90823c2d4eaf76137b771adf31323"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/7b604c89da162034bdf4bb66310f358d313dd16d", "url": "https://api.github.com/repos/twigphp/Twig/zipball/6a5f676b77a90823c2d4eaf76137b771adf31323",
"reference": "7b604c89da162034bdf4bb66310f358d313dd16d", "reference": "6a5f676b77a90823c2d4eaf76137b771adf31323",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.0", "php": "^7.0",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "~1.0" "symfony/polyfill-mbstring": "~1.0"
}, },
"require-dev": { "require-dev": {
@ -778,7 +839,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.4-dev" "dev-master": "2.5-dev"
} }
}, },
"autoload": { "autoload": {
@ -807,16 +868,16 @@
}, },
{ {
"name": "Twig Team", "name": "Twig Team",
"homepage": "http://twig.sensiolabs.org/contributors", "homepage": "https://twig.symfony.com/contributors",
"role": "Contributors" "role": "Contributors"
} }
], ],
"description": "Twig, the flexible, fast, and secure template language for PHP", "description": "Twig, the flexible, fast, and secure template language for PHP",
"homepage": "http://twig.sensiolabs.org", "homepage": "https://twig.symfony.com",
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2018-04-02T09:24:19+00:00" "time": "2018-07-13T07:18:09+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
@ -876,25 +937,28 @@
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
"version": "1.7.0", "version": "1.8.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/myclabs/DeepCopy.git", "url": "https://github.com/myclabs/DeepCopy.git",
"reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
"reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.6 || ^7.0" "php": "^7.1"
},
"replace": {
"myclabs/deep-copy": "self.version"
}, },
"require-dev": { "require-dev": {
"doctrine/collections": "^1.0", "doctrine/collections": "^1.0",
"doctrine/common": "^2.6", "doctrine/common": "^2.6",
"phpunit/phpunit": "^4.1" "phpunit/phpunit": "^7.1"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -917,7 +981,7 @@
"object", "object",
"object graph" "object graph"
], ],
"time": "2017-10-19T19:58:43+00:00" "time": "2018-06-11T23:09:50+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
@ -1073,16 +1137,16 @@
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
"version": "1.7.6", "version": "1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/prophecy.git", "url": "https://github.com/phpspec/prophecy.git",
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1094,12 +1158,12 @@
}, },
"require-dev": { "require-dev": {
"phpspec/phpspec": "^2.5|^3.2", "phpspec/phpspec": "^2.5|^3.2",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7.x-dev" "dev-master": "1.8.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1132,7 +1196,7 @@
"spy", "spy",
"stub" "stub"
], ],
"time": "2018-04-18T13:57:24+00:00" "time": "2018-08-05T17:53:17+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -2039,20 +2103,21 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v4.0.9", "version": "v4.1.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "275ad099e4cbe612a2acbca14a16dd1c5311324d" "reference": "367e689b2fdc19965be435337b50bc8adf2746c9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/275ad099e4cbe612a2acbca14a16dd1c5311324d", "url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9",
"reference": "275ad099e4cbe612a2acbca14a16dd1c5311324d", "reference": "367e689b2fdc19965be435337b50bc8adf2746c9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3" "php": "^7.1.3",
"symfony/polyfill-ctype": "~1.8"
}, },
"conflict": { "conflict": {
"symfony/console": "<3.4" "symfony/console": "<3.4"
@ -2066,7 +2131,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
@ -2093,7 +2158,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-08T08:49:08+00:00" "time": "2018-10-02T16:36:10+00:00"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 KiB

After

Width:  |  Height:  |  Size: 720 KiB

View File

@ -114,6 +114,7 @@ hr.separador{
{ /*width: 860px;*/ { /*width: 860px;*/
/*position: relative*/ /*position: relative*/
/*height: 200px;*/ /*height: 200px;*/
padding:10px 0px; padding:10px 0px;
background:transparent; background:transparent;
@ -203,7 +204,7 @@ ul#menu li a{
font-family: sans-serif; font-family: sans-serif;
} }
ul#menu li.active a, ul#menu li a:hover{ ul#menu li.active a, ul#menu li a:hover{
color: #FC9C04; color: #69b4f7;
} }

View File

@ -1,18 +1,18 @@
<header id="header"> <header id="header">
<!--<div class="bg"></div>--> <!--<div class="bg"></div>-->
<div id="logo" class="jumbotron" data-parallax="scroll" data-image-src="img/headerpic2.jpg"> <div id="logo" class="jumbotron" data-parallax="scroll" data-position="left center" data-natural-height="803" data-natural-width="2916" data-image-src="img/headerpic2.jpg">
<div id="logo_text"> <div id="logo_text">
<!-- class="logo_colour", allows you to change the colour of the text --> <!-- class="logo_colour", allows you to change the colour of the text -->
<h1 class="title"><a href="/"><span class="logo_colour"> Workshop on Surfaces</span></a></h1> <h1 class="title"><a href="/"><span class="logo_colour"> Workshop on Surfaces Dynamics</span></a></h1>
<h2 class="subtitle"> <h2 class="subtitle">
<strong>Celebrating Patrice Le Calvez 60<sup>th</sup> birthday</strong><br> <strong>On the occasion of Patrice Le Calvez 60<sup>th</sup> birthday</strong><br>
</h2> </h2>
<h2 id="when" class="subtitle"> <h2 id="when" class="subtitle">
<strong>10 &#8211; 14, December 2018</strong> <strong>17 &#8211; 29, December 2018</strong>
</h2> </h2>
<h2 id="where" class="subtitle"> <h2 id="where" class="subtitle">
<strong>Montevideo, Uruguay</strong> <strong>Montevideo, Uruguay</strong>

View File

@ -17,7 +17,7 @@
idea is to have few talks and lots of discussion time. idea is to have few talks and lots of discussion time.
</p> </p>
<hr class="separador"> <hr class="separador">
<p> <!--<p>
During the conference we will be holding a memorial recognition to Ricardo Mañé During the conference we will be holding a memorial recognition to Ricardo Mañé
(1948-1995), a top Uruguayan (and Brazilian) mathematician who worked on Dynamical (1948-1995), a top Uruguayan (and Brazilian) mathematician who worked on Dynamical
Systems, and who in 2018 would have been 70 years old. Systems, and who in 2018 would have been 70 years old.
@ -87,5 +87,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>-->
{% endblock %} {% endblock %}

View File

@ -2,13 +2,13 @@
<html> <html>
<head> <head>
<title>Surfaces Workshop</title> <title>Surface Dynamics Workshop 2018</title>
<meta name="description" content="Workshop on Surfaces" /> <meta name="description" content="Workshop on Surfaces Dynamics 2018" />
<meta name="keywords" content="Workshop Surfaces Patrice Le Calvez" /> <meta name="keywords" content="Workshop Surfaces Patrice Le Calvez" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico" /> <link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="alternate" href="http://ggdworkshop.cmat.edu.uy" hreflang="es-uy" /> <link rel="alternate" href="http://www.surfacesdynamics2018.cmat.edu.uy" hreflang="es-uy" />
<!-- Jquery --> <!-- Jquery -->
<script type="text/javascript" src="js/lib/jquery/jquery-3.2.1.min.js"></script> <script type="text/javascript" src="js/lib/jquery/jquery-3.2.1.min.js"></script>

View File

@ -29,6 +29,6 @@
<div class="row"> <div class="row">
<div class="col-xs-12 text-center"> <div class="col-xs-12 text-center">
<h1>Contact</h1> <h1>Contact</h1>
<h4><a href="mailto:ggdworkshop@cmat.edu.uy">ggdworkshop@cmat.edu.uy</a></h4> <h4><a href="mailto:surfacedynamics2018@cmat.edu.uy">surfacedynamics2018@cmat.edu.uy</a></h4>
</div> </div>
</div> </div>