diff --git a/Gemfile.lock b/Gemfile.lock index 299785a..950e7a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,10 +30,10 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - autoprefixer-rails (8.2.0) + autoprefixer-rails (8.6.2) execjs awesome_print (1.8.0) - backports (3.11.1) + backports (3.11.3) betterlorem (0.1.2) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) @@ -50,16 +50,16 @@ GEM concurrent-ruby (1.0.5) contracts (0.13.0) crass (1.0.4) - dotenv (2.2.2) + dotenv (2.4.0) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.2.5) + eventmachine (1.2.7) execjs (2.7.0) fast_blank (1.0.0) - fastimage (2.1.1) - ffi (1.9.23) + fastimage (2.1.3) + ffi (1.9.25) globalid (0.4.1) activesupport (>= 4.2.0) haml (5.0.4) @@ -71,7 +71,7 @@ GEM http_parser.rb (0.6.0) i18n (0.7.0) icalendar (2.4.1) - kramdown (1.16.2) + kramdown (1.17.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -144,7 +144,7 @@ GEM byebug (~> 10.0) pry (~> 0.10) public_suffix (3.0.2) - rack (2.0.4) + rack (2.0.5) rack-livereload (0.3.17) rack rack-test (0.6.3) @@ -191,4 +191,4 @@ DEPENDENCIES wdm BUNDLED WITH - 1.16.1 + 1.16.2 diff --git a/source/images/giggity.png b/source/images/giggity.png new file mode 100644 index 0000000..647c94e Binary files /dev/null and b/source/images/giggity.png differ diff --git a/source/images/logo.ico b/source/images/logo.ico new file mode 100644 index 0000000..8a93b1b Binary files /dev/null and b/source/images/logo.ico differ diff --git a/source/images/qrcode.png b/source/images/qrcode.png new file mode 100644 index 0000000..e29cb96 Binary files /dev/null and b/source/images/qrcode.png differ diff --git a/source/index.html.erb b/source/index.html.erb index bd747c6..e71a803 100644 --- a/source/index.html.erb +++ b/source/index.html.erb @@ -53,7 +53,7 @@ attributes = n == 1 ? nil : { colspan: n } content_tag :th, attributes do content = I18n.l day, format: '%A %d %B' - content += '
Journée spéciale RGPD' if day == Date.new(2018, 6, 29) + content += '
Journée spéciale protection des données personnelles' if day == Date.new(2018, 6, 29) content end %> @@ -71,6 +71,8 @@ 'Accueil' when :town 'Village asso' + when :young + 'Espace jeunesse' end %> @@ -138,6 +140,9 @@
  •   Concert
  • +
  • +   Animations +
  •   Divers
  • diff --git a/source/stylesheets/site.css.scss b/source/stylesheets/site.css.scss index e42430e..48ac2da 100644 --- a/source/stylesheets/site.css.scss +++ b/source/stylesheets/site.css.scss @@ -22,8 +22,9 @@ $background: #212121; $event-talk: #2980b9; $event-workshop: #c0392b; $event-concert: #27ae60; -$event-round-table: #FFC107; +$event-round-table: #283593; $event-misc: #673AB7; +$event-young: #EF6C00; @mixin event($color) { background-color: $color; @@ -164,6 +165,10 @@ ul.legend { @include event($event-misc); } +.young { + @include event($event-young); +} + .close { position: absolute; top: 0;