develop to master

.eslintrc.json

@@ -47,6 +47,7 @@
     "pokemonIconPath": true,
     "itemIconPath": true,
     "eggIconPath": true,
-    "Store": true
+    "Store": true,
+    "GeofenceDefault": true
   }
 }

Gruntfile.js

@@ -58,6 +58,7 @@ module.exports = function (grunt) {
             build: {
                 files: {
                     'static/dist/data/pokemon.min.json': 'static/data/pokemon.json',
+                    'static/dist/data/pokedex.min.json': 'static/data/pokedex.json',
                     'static/dist/data/items.min.json': 'static/data/items.json',
                     'static/dist/data/grunttype.min.json': 'static/data/grunttype.json',
                     'static/dist/locales/de.min.json': 'static/locales/de.json',

config/default.php

@@ -69,7 +69,7 @@
 $raidPage = true;
 $rewardPage = true;
 $invasionPage = true;
-$shinyPage = false;   // Does not work for mad yet.
+$shinyPage = true;
 
 /* Nest Page */
 $nestPage = true;

config/example.config.php

@@ -56,7 +56,7 @@
 $raidPage = true;
 $rewardPage = true;
 $invasionPage = true;
-$shinyPage = false;   // Does not work for mad yet.
+$shinyPage = true;
 
 /* Nest Page */
 $nestPage = true;

custom/css/custom.css.example

@@ -8,7 +8,7 @@ body {
 tbody {
   background-color: white;
 }
-.card-header {
+.card-header-overview {
   background-image: url(../../static/images/stop.png);
   background-size: 60px auto;
   background-repeat: no-repeat;
@@ -19,40 +19,40 @@ tbody {
   color: #000000!important;
 }
 
-a.neutral:hover {
+div.neutral:hover {
   background-color:#dddddd;
 }
-a.neutral:hover * {
+div.neutral:hover * {
   color:#FFF;
 }
 
-a.valor i,.valor h4.list-group-item-heading {
+div.valor i,.valor h4.list-group-item-heading {
   color: #f71208;
 }
-a.valor:hover {
+div.valor:hover {
   background-color:#dd4b39;
 }
-a.valor:hover * {
+div.valor:hover * {
   color:#FFF;
 }
 
-a.mystic i,.mystic h4.list-group-item-heading {
+div.mystic i,.mystic h4.list-group-item-heading {
   color:#0076f3;
 }
-a.mystic:hover {
+div.mystic:hover {
   background-color:#3b5998;
 }
-a.mystic:hover * {
+div.mystic:hover * {
   color:#FFF;
 }
 
-a.instinct i,.instinct h4.list-group-item-heading {
+div.instinct i,.instinct h4.list-group-item-heading {
   color:#ffd200;
 }
-a.instinct:hover {
+div.instinct:hover {
   background-color:#ffd20073;
 }
-a.instinct:hover * {
+div.instinct:hover * {
   color:black;
 }