Merge branch 'release/3.4.13' into v3.0

.travis.yml

@@ -1,34 +1,27 @@
+sudo: required
+dist: trusty
 language: php
 
 php:
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
-before_script:
-  # Uninstall MySQL 5.5
-  - sudo apt-get remove mysql-server-5.5 mysql-server-core-5.5
-  - sudo apt-get autoremove
-  # Install MySQL 5.6
-  - sudo apt-get install libaio1
-  - wget -O mysql-5.6.17.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.17-debian6.0-x86_64.deb/from/http://cdn.mysql.com/
-  - sudo dpkg -i mysql-5.6.17.deb
-  - sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server
-  - sudo ln -sf /opt/mysql/server-5.6/bin/* /usr/bin/
-  # Update configuration for switch from 5.5 to 5.6
-  - sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf
-  - sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf
-  - sudo sed -i'' 's/basedir[^=]\+=.*$/basedir = \/opt\/mysql\/server-5.6/' /etc/mysql/my.cnf
-  - sudo /etc/init.d/mysql.server start
+before_install:
+  # Manually install MySQL 5.6 since the default is v5.5.
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq mysql-server-5.6 mysql-client-5.6 mysql-client-core-5.6
   # Install and run Mailcatcher
   - gem install mailcatcher
   - mailcatcher -f -v > out.txt&
   # Install Imagick
-  - sudo apt-get update -q
   - sudo apt-get install -y imagemagick
   - printf "\n" | pecl install imagick
   # Create the database for tests
-  - mysql -e 'create database codeception;' -utravis
+  - mysql -e "CREATE DATABASE codeception;" -uroot
+  - mysql -e "CREATE USER 'travis'@'localhost';" -uroot
+  - mysql -e "GRANT ALL PRIVILEGES ON codeception. * TO 'travis'@'localhost';" -uroot
   # Grab external dependencies
   - travis_retry composer self-update
   - mv .env.example .env
@@ -42,5 +35,5 @@ script:
 
 matrix:
   allow_failures:
+    - php: 7.0
     - php: hhvm
-  fast_finish: true

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
-  "assets/css/styles.min.css": "assets/css/styles.min-c88ff3c1c1.css",
-  "assets/js/scripts.min.js": "assets/js/scripts.min-026f200b51.js"
+  "assets/css/styles.min.css": "assets/css/styles.min-5719ec910b.css",
+  "assets/js/scripts.min.js": "assets/js/scripts.min-50a318261b.js"
 }

ressources/sass/screen.scss

@@ -141,12 +141,12 @@ h3 {
 
 .navbar-fixed-top {
 	.logo {
-		@include background-image-retina($imagesFolder + 'logo-xmas', 'png', 200px, 30px);
+		@include background-image-retina($imagesFolder + 'logo', 'png', 200px, 30px);
 		background-repeat: no-repeat;
 		width: 200px;
 		height: 30px;
 		display: block;
-		margin: 9px 10px 0 0;
+		margin: 12px 10px 0 0;
 		float: left;
 
 		@media screen and (min-width: 320px) and (max-width: 992px) {