From 9622faa4391bb275d574901e5fc137cc1fad13ed Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 30 Mar 2017 10:40:31 +0200 Subject: [PATCH] SPR-742: Konfigurierbarkeit zuordnung --- css/area_main-sidebar-nav.less | 10 ++++++++-- css/area_nav-metabox.less | 12 ++++++++++++ lang/de/lang.php | 29 ++++++++++++++--------------- lang/en/lang.php | 25 +++++++++++++------------ 4 files changed, 47 insertions(+), 29 deletions(-) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 56ad017..681dd4d 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -24,8 +24,14 @@ } } - nav li { - color: @ini_nav_menu_color; + nav { + li { + color: @ini_nav_menu_color; + + > div { + color: @ini_text_webframe; + } + } } diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 35b35e9..165d831 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -1,3 +1,10 @@ +/** + * This file provides the design styles for the metatabbox + * + * @author Jana Deutschlaender + */ + + #spr__meta-box { .display-flex(); .flex-direction(); @@ -44,6 +51,8 @@ overflow-y: visible; } + +/* + + + + + tab controlls + + + + + */ ul.meta-tabs { list-style: none; line-height: 160%; @@ -95,6 +104,7 @@ @media @screen_min-md { background-color: @ini_background; border: 1px solid @noopentasks-border; + border-bottom-color: @ini_background; border-radius: @ini_default_border_radius @ini_default_border_radius 0 0; // @ini_default_border_radius vs. @fix_border-radius color: @ini_nav_menu_color; margin-left: 4px; @@ -161,6 +171,8 @@ } } + +/* + + + + + toggle content + + + + + */ .meta-content { margin-top: -1px; diff --git a/lang/de/lang.php b/lang/de/lang.php index c05b674..c9628a4 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -51,27 +51,28 @@ $lang['userpage'] = 'Benutzer-Seite'; $lang['__site_width__'] = 'Content - Breite (in %)'; $lang['__background__'] = 'Website - Hintergrundfarbe'; -$lang['__background_neu__'] = 'Website - Hintergrundfarbe - neutral'; +$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'; -$lang['__nav_menu_hover_color__'] = 'verlinkt-hover: Navigation, Wiki Icons - Schriftfarbe, Rahmenfarbe'; -$lang['__nav_menu_hover_bg__'] = 'verlinkt-hover: Navigation, Wiki Icons - Hintergrundfarbe'; +$lang['__nav_menu_color__'] = '+ verlinkt: Navigation, Footer, Pagetools Icons, Tabbox - Schriftfarbe'; +$lang['__nav_menu_hover_color__'] = '+ verlinkt: Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe'; +$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['__background_page_header__'] = 'Content (Header, Footer, Tabinclude) - Hintergrundfarbe'; -$lang['__background_page_footer__'] = 'Content (Footer, Tabinclude Tab controlls) - Schriftfarbe'; +$lang['__background_content__'] = '+ Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe'; +$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), Wiki Icons, Pagetools (hover) - Rahmenfarbe'; +$lang['__border_light__'] = '+ Content: Header, Footer, Wiki Icons, Pagetools Box (hover) - Rahmenfarbe'; + +$lang['__text__'] = 'Content: Text - Schriftfarbe'; +$lang['__text_neu__'] = 'Content - Schriftfarbe (neutral)'; -$lang['__text__'] = 'Content - 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'; -$lang['__existing__'] = 'Links zu Wikiseiten, Stift, hover: Tabbox, Pagetools - Schriftfarbe'; -$lang['__missing__'] = 'Links zu nicht vorhandenen Wikiseiten - Schriftfarbe'; +$lang['__existing__'] = 'Links zu Wikiseiten, Stift, Pagetools (hover) - Schriftfarbe; Tabbox (hover) - Schriftfarbe, Rahmenfarbe'; $lang['__link__'] = 'Links zu nicht-Wikiseiten (externe Links) - Schriftfarbe'; +$lang['__missing__'] = 'Links zu nicht vorhandenen Wikiseiten - Schriftfarbe'; $lang['__button_color__'] = 'Buttons - Schriftfarbe'; $lang['__button_background__'] = 'Buttons - Hintergrundfarbe'; @@ -79,7 +80,5 @@ $lang['__button_background__'] = 'Buttons - Hintergrundfarbe'; $lang['__background_alt__'] = 'Tabellenkopf, hover: Tabellenzeile, struct Label - Hintergrundfarbe (alternativ)'; $lang['__text_alt__'] = 'Tabellenkopf, hover: Tabellenzeile, struct Label - Schriftfarbe (alternativ)'; -$lang['__border__'] = 'Tabellen, Formularfelder - Rahmenfarbe'; +$lang['__border__'] = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe'; $lang['__default_border_radius__'] = 'Wiki Icons, Content (oben rechts) - Borderradius'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/en/lang.php b/lang/en/lang.php index 84a2912..0df814f 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -51,27 +51,28 @@ $lang['userpage'] = 'User page'; $lang['__site_width__'] = 'content - width (in %)'; $lang['__background__'] = 'website - background color'; -$lang['__background_neu__'] = 'website - background color - neutral'; +$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'; -$lang['__nav_menu_hover_color__'] = 'link-hover: navigation, wiki icons - font color, border color'; -$lang['__nav_menu_hover_bg__'] = 'link-hover: navigation, wiki icons - background color'; +$lang['__nav_menu_hover_color__'] = 'link: navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color'; +$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['__background_page_header__'] = 'content (header, footer, tabinclude) - background color'; -$lang['__background_page_footer__'] = 'content (footer, tabinclude tab controlls) - font color'; +$lang['__background_content__'] = 'content, breadcrumb, pagetools (hover) - background 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), wiki icons, pagetools (hover) - border color'; +$lang['__border_light__'] = 'content: header, footer, wiki icons, pagetools box (hover) - border color'; + +$lang['__text__'] = 'content: text - font color'; +$lang['__text_neu__'] = 'content: text - font color (neutral)'; -$lang['__text__'] = 'content - font color'; -$lang['__text_neu__'] = 'content - 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'; -$lang['__existing__'] = 'links to wikipages, pencil, hover: tabbox, pagetools - font color'; -$lang['__missing__'] = 'links to non-existing pages - font color'; +$lang['__existing__'] = 'links to wikipages, pencil, pagetools (hover) - font color; tabbox (hover) - font color, border color'; $lang['__link__'] = 'links to non wikipages (external links) - font color'; +$lang['__missing__'] = 'links to non-existing pages - font color'; $lang['__button_color__'] = 'buttons - font color'; $lang['__button_background__'] = 'buttons - background color'; @@ -79,5 +80,5 @@ $lang['__button_background__'] = 'buttons - background color'; $lang['__background_alt__'] = 'table head, hover: table cell, struct Label - background color (alternative)'; $lang['__text_alt__'] = 'table head, hover: table cell, struct Label - font color (alternative)'; -$lang['__border__'] = 'tables, form fields - border color'; +$lang['__border__'] = 'tables, form fields, blockquotes - border color'; $lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius';