From 5c8e72a675867c2b34a26a6025225f998780d12b Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 7 Apr 2017 13:45:40 +0200 Subject: [PATCH] SPR-742: Konfigurierbarkeit - wording --- lang/de/lang.php | 9 +++++---- lang/en/lang.php | 9 +++++---- style.ini | 13 +++++++------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/lang/de/lang.php b/lang/de/lang.php index 59e65e3..2de4372 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -51,7 +51,6 @@ $lang['userpage'] = 'Benutzer-Seite'; $lang['__site_width__'] = 'Content - Breite (in %)'; $lang['__background__'] = 'Website - Hintergrundfarbe'; -$lang['__background_neu__'] = 'Website - Hintergrundfarbe (neutral)'; $lang['__text_webframe__'] = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe'; $lang['__nav_menu_color__'] = 'verlinkt: Navigation, Footer, Pagetools Icons, Tabbox - Schriftfarbe'; @@ -59,14 +58,16 @@ $lang['__nav_menu_hover_color__'] = 'verlinkt: Navigation (hover) - Schriftfar $lang['__nav_menu_hover_bg__'] = 'verlinkt: Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe'; $lang['__background_content__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe'; +$lang['__text__'] = 'Content: Text - Schriftfarbe'; + +$lang['__background_neu__'] = 'Content neutral (nicht zu unterschiedlich zum Content-Hintergrund) - Hintergrundfarbe'; +$lang['__text_neu__'] = 'Content neutral - Schriftfarbe'; + $lang['__background_page_header__'] = 'Content: Header, Footer, Tabinclude Tab controlls deaktiviert - Hintergrundfarbe'; $lang['__background_page_footer__'] = 'Content: Footer, Tabinclude Tab controlls deaktiviert - Schriftfarbe'; $lang['__border_light__'] = 'Content: Header, Footer - Rahmenfarbe'; -$lang['__text__'] = 'Content: Text - Schriftfarbe'; -$lang['__text_neu__'] = 'Content - Schriftfarbe (neutral)'; - $lang['__highlight__'] = 'Texthervorhebung (z.B. für Suchergebnisse) - Hintergrundfarbe'; $lang['__highlight_text__'] = 'Texthervorhebung (z.B. für Suchergebnisse) - Schriftfarbe'; diff --git a/lang/en/lang.php b/lang/en/lang.php index fd5bad4..f634485 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -52,7 +52,6 @@ $lang['userpage'] = 'User page'; $lang['__site_width__'] = 'content - width (in %)'; $lang['__background__'] = 'website - background color'; -$lang['__background_neu__'] = 'website - background color (neutral)'; $lang['__text_webframe__'] = 'website unlinked: claim, title, footer, navigation - font color'; $lang['__nav_menu_color__'] = 'link: navigation, footer, pagetools icons, tabbox - font color'; @@ -60,14 +59,16 @@ $lang['__nav_menu_hover_color__'] = 'link: navigation (hover) - font color, bo $lang['__nav_menu_hover_bg__'] = 'link: navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color'; $lang['__background_content__'] = 'content, breadcrumb, pagetools (hover) - background color'; +$lang['__text__'] = 'content: text - font color'; + +$lang['__background_neu__'] = 'Content neutral (not too different from the content background) - background color'; +$lang['__text_neu__'] = 'content neutral: text - font color'; + $lang['__background_page_header__'] = 'content: header, footer, tabinclude tab controlls deactivate - background color'; $lang['__background_page_footer__'] = 'content: footer, tabinclude tab controlls deactivate - font color'; $lang['__border_light__'] = 'content: header, footer - border color'; -$lang['__text__'] = 'content: text - font color'; -$lang['__text_neu__'] = 'content: text - font color (neutral)'; - $lang['__highlight__'] = 'text emphasize (e.g. for search results) - background color'; $lang['__highlight_text__'] = 'text emphasize (e.g. for search results) - font color'; diff --git a/style.ini b/style.ini index e284f97..1fd8b20 100755 --- a/style.ini +++ b/style.ini @@ -78,6 +78,7 @@ css/area_main-content-secedit.less = all css/area_togglelink.less = all css/area_forms.less = all css/area_search.less = all +css/area_tabs.less = all css/template_admin.less = all @@ -99,6 +100,7 @@ css/plugins/include.less = all css/plugins/edittable.less = all css/plugins/extension__manager.less = all css/plugins/folded.less = all +css/plugins/configmanager.less = all ; _____________ print styles _____________ @@ -126,7 +128,6 @@ __site_width__ = "73%" ; @ini_site_width ; alternative text and background colors __background__ = "#ECECEC" ; @ini_background (guaranteed for every plugin) -__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin) __text_webframe__ = "#696969" ; @ini_text_webframe @@ -137,16 +138,16 @@ __nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color __nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg __background_content__ = "#FFF" ; @ini_background_content +__text__ = "#252525" ; @ini_text (guaranteed for every plugin) + +__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin) +__text_neu__ = "#656565" ; @ini_text_neu (guaranteed for every plugin) + __background_page_header__ = "#F6F6F6" ; @ini_background_page_header __border_light__ = "#dadada" ; @ini_border_light __background_page_footer__ = "#252525" ; @ini_background_page_footer -; main text and background colors -__text__ = "#252525" ; @ini_text (guaranteed for every plugin) -__text_neu__ = "#656565" ; @ini_text_neu (guaranteed for every plugin) - - ; highlighted text (e.g. search snippets) __highlight__ = "#efefef" ; @ini_highlight (guaranteed for every plugin) __highlight_text__ = "#252525" ; @ini_highlight_text