Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master

# Conflicts:
#	lang/de/lang.php
This commit is contained in:
Silke Pisulla 2017-04-26 09:37:42 +02:00
commit fabd75acdf
25 changed files with 129 additions and 118 deletions

View file

@ -12,7 +12,7 @@
@font_family_screen: arial, sans-serif;
@font_family_print: "Times New Roman", serif;
@nav_direct_background: @ini_background_content;
@nav_direct_background: @ini_background;
@nav_direct_color: @ini_existing;
@background_darker: rgba(230,230,230, .2);
@ -73,12 +73,12 @@
/* edit mode */
@highlight-odd-ini_text: fade(@ini_background_content, 95%);
@highlight-odd-ini_text: fade(@ini_background, 95%);
@highlight-even-ini_text: fade(@ini_text, 5%);
@color-editBox: #252525; // editmode for tables, revision states
//@nolinkedicon-ini_background: fade(@ini_background, 10%);
//@nolinkedicon-ini_background: fade(@ini_background_site, 10%);
//@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%);