Merge branch 'master' into toggleConf

This commit is contained in:
Michael Große 2017-04-18 13:10:14 +02:00
commit 1c24bf1989
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79
15 changed files with 390 additions and 148 deletions

View file

@ -116,7 +116,7 @@
flex-grow: 0;
border-right: 1px solid @ini_nav_menu_color;
text-align: center;
margin-right: @margin-small;
margin-right: 4%;
color: inherit;
// simple fake icon