Merged Parent theme into Child theme

[ibes]

The way to do it doesn't matter much as in the end it is just one theme anyway. The advantage to merge parent in child was, that we will have less trouble with menu settings and stuff as that is saved to the current stylesheet handle which will stay consistent this way.

Please test carefully.

What I have done:

• combine all files of both themes except for styles.css (normally also functions.php would need to be handled separately but the parent theme's functions.php was already killed at some point)
• load the original parent theme css before the child themes css before the css that is added by the child theme (this three files might need some clean up)
• make sure that the include paths are all corrected and no more debug.log or console output stuff shows up
• make sure that everything looks fine

After the merge we could clean up, reduce complexity etc.

Likely it is still good to clear things before starting on a new foundation. Both because a new foundation might take a while and because we will need to take care of some amount of legacy stuff anyway. We are not starting from scratch so there will be plugin dependencies, some custom solutions etc. that need to be taken care of. This will likely be easier with less mess.

[michael-voit]

Habe einen ersten deploy zu staging geamcht und daraufhin eine zerschossene Seite gehabt, da die style.css aus dem theme root nun ja eigentlich eine andere ist (die bisherige vom child theme heißt ja nun anders und die bisherige parent theme style.css ist jetzt die "child theme" style.css). Das hat den Browser-Cache natürlich nicht gejuckt und er hat die alte genommen.

Daher der oben stehende commit.