From c2023c17f64fb34bb336fb71641be592a5b20b51 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 25 Apr 2017 09:05:45 +0200 Subject: [PATCH 01/10] SPR-908: quicksearch immer ausgeklappt --- css/area_main-sidebar-search.less | 42 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index eeef1b3..3440215 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -181,30 +181,32 @@ /* + + + + + wide page content + + + + + */ -.wide-content { - .search.main-sidebar { - p.toggleSearch { - position: relative; - z-index: 1; - display: block; - float: left; - width: 100%; - } - - form { - input { - border: 0 none; +@media @screen_min-md { + .wide-content { + .search.main-sidebar { + p.toggleSearch { + position: relative; + z-index: 1; + display: block; + float: left; + width: 100%; } - .no { - #qsearch__in { - width: 0; - padding: 0; - margin: 0; + form { + input { + border: 0 none; } - button[type="submit"] { - display: none; + .no { + #qsearch__in { + width: 0; + padding: 0; + margin: 0; + } + + button[type="submit"] { + display: none; + } } } } From 86e59cb304c137acc395c9a02b1f451ca255d43b Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 26 Apr 2017 09:18:31 +0200 Subject: [PATCH 02/10] SPR-908: qs font-size, color, padding --- css/area_main-sidebar-nav.less | 51 ++++++++++++---------------------- css/area_nav-metabox.less | 1 + css/base.less | 1 + css/base_mixins.less | 2 +- css/plugins/tagging.less | 2 +- lang/de/lang.php | 12 ++++---- lang/en/lang.php | 12 ++++---- 7 files changed, 34 insertions(+), 47 deletions(-) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 61fd70d..822c749 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -154,7 +154,6 @@ border: 2px solid @ini_nav_menu_color; border-top-right-radius: 50%; border-bottom-left-radius: 50%; - transition: @transition border-color; } // real icon @@ -278,24 +277,30 @@ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1023px */ +/* max-width: 1439px */ -@media @screen_max-md { - // show when toggled - body.show-mobile-sidebar { - .search.main-sidebar { - display: block !important; - position: relative; +@media @screen_max-xlg { + #dokuwiki__aside { + nav { + li:not([class]), + .li { + font-size: @font-size-default; - form { - margin-bottom: 1rem; - - .no { - display: block; + * { + font-size: inherit; + font-weight: inherit; } } } + } +} + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1023px */ + +@media @screen_max-md { + body.show-mobile-sidebar { #dokuwiki__aside { > nav { position: relative; @@ -319,23 +324,3 @@ } } } - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1439px */ - -@media @screen_max-xlg { - #dokuwiki__aside { - nav { - li:not([class]), - .li { - font-size: @font-size-default; - - * { - font-size: inherit; - font-weight: inherit; - } - } - } - } -} diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 165d831..152c946 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -123,6 +123,7 @@ * { cursor: pointer; color: inherit; + font-size: inherit; } .prefix { diff --git a/css/base.less b/css/base.less index d6361c1..db658b0 100755 --- a/css/base.less +++ b/css/base.less @@ -15,6 +15,7 @@ @nav_direct_background: @ini_background_content; @nav_direct_color: @ini_existing; +@background_darker: rgba(230,230,230, .2); @ini_sidebar_width: (100 - @ini_site_width) - 4; @height-context-bar: 50px; diff --git a/css/base_mixins.less b/css/base_mixins.less index e17ee37..9725764 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -151,7 +151,7 @@ &:active, &:focus { background-color: @ini_nav_menu_hover_color; - border-color: @ini_nav_menu_hover_color; + border-color: @ini_nav_menu_hover_bg; color: @ini_nav_menu_hover_bg; .prefix { diff --git a/css/plugins/tagging.less b/css/plugins/tagging.less index a15cdfb..280448f 100644 --- a/css/plugins/tagging.less +++ b/css/plugins/tagging.less @@ -12,7 +12,7 @@ li { &.t0 a { - font-size: .9rem; + font-size: .88rem; } &.t1 a { font-size: 1rem; diff --git a/lang/de/lang.php b/lang/de/lang.php index 723c3fe..781177e 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -56,11 +56,11 @@ $lang['image_detail'] = 'Detailinformationen zum Bild'; $lang['__site_width__'] = 'Content - Breite (in %)'; $lang['__background__'] = 'Website - Hintergrundfarbe'; -$lang['__text_webframe__'] = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe'; +$lang['__text_webframe__'] = 'Claim, Titel, Footer (unverlinkt), Navigation (unverlinkt) - Schriftfarbe'; -$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['__nav_menu_color__'] = 'Navigation (verlinkt), Footer (verlinkt), Pagetools Icons, Tabbox - Schriftfarbe'; +$lang['__nav_menu_hover_color__'] = 'Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe'; +$lang['__nav_menu_hover_bg__'] = 'Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe'; $lang['__background_content__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe'; $lang['__text__'] = 'Content: Text - Schriftfarbe'; @@ -83,8 +83,8 @@ $lang['__missing__'] = 'Links zu nicht vorhandenen Wikiseiten - S $lang['__button_color__'] = 'Buttons - Schriftfarbe'; $lang['__button_background__'] = 'Buttons - Hintergrundfarbe'; -$lang['__background_alt__'] = 'Tabellenkopf, hover: Tabellenzeile, struct Label - Hintergrundfarbe (alternativ)'; -$lang['__text_alt__'] = 'Tabellenkopf unverlinkt, hover: Tabellenzeile, struct Label - Schriftfarbe (alternativ)'; +$lang['__background_alt__'] = 'Tabellenkopf, Tabellenzeile (hover), struct Label (hover) - Hintergrundfarbe (alternativ)'; +$lang['__text_alt__'] = 'Tabellenkopf (unverlinkt), Tabellenzeile (hover), struct Label (hover) - Schriftfarbe (alternativ)'; $lang['__border__'] = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe'; $lang['__default_border_radius__'] = 'Wiki Icons, Content (oben rechts) - Borderradius'; diff --git a/lang/en/lang.php b/lang/en/lang.php index 679c2ba..8cecb5d 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -63,11 +63,11 @@ $lang['image_detail'] = 'image details'; $lang['__site_width__'] = 'content - width (in %)'; $lang['__background__'] = 'website - background color'; -$lang['__text_webframe__'] = 'website unlinked: claim, title, footer, navigation - font color'; +$lang['__text_webframe__'] = 'claim, title, footer (unlinked), navigation (unlinked) - font color'; -$lang['__nav_menu_color__'] = 'link: navigation, footer, pagetools icons, tabbox - font 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['__nav_menu_color__'] = 'navigation (link), footer (link), pagetools icons, tabbox - font color'; +$lang['__nav_menu_hover_color__'] = 'navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color'; +$lang['__nav_menu_hover_bg__'] = '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'; @@ -90,8 +90,8 @@ $lang['__missing__'] = 'links to non-existing pages - font color' $lang['__button_color__'] = 'buttons - font color'; $lang['__button_background__'] = 'buttons - background color'; -$lang['__background_alt__'] = 'table head, hover: table cell, struct Label - background color (alternative)'; -$lang['__text_alt__'] = 'table head unlinked, hover: table cell, struct Label - font color (alternative)'; +$lang['__background_alt__'] = 'table head, table cell (hover), struct Label (hover) - background color (alternative)'; +$lang['__text_alt__'] = 'table head (unlinked), table cell (hover), struct Label (hover) - font color (alternative)'; $lang['__border__'] = 'tables, form fields, blockquotes - border color'; $lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius'; From 63bb23ddb61d19def346a3a345381b0595951346 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 26 Apr 2017 09:20:14 +0200 Subject: [PATCH 03/10] SPR-742: configure configmanager --- css/plugins/configmanager.less | 59 ++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/css/plugins/configmanager.less b/css/plugins/configmanager.less index 97f6948..45a3718 100644 --- a/css/plugins/configmanager.less +++ b/css/plugins/configmanager.less @@ -7,8 +7,16 @@ #dokuwiki__content { #config__manager { + fieldset { + box-sizing: border-box; + background-color: @background_darker; + margin-left: 0; + margin-right: 0; + } + .selectiondefault { background-color: transparent; + color: inherit; } tr { @@ -16,6 +24,12 @@ background-color: transparent; color: inherit; } + + &:hover { + td { + color: inherit; + } + } } tr.default { @@ -23,5 +37,50 @@ background-color: transparent; } } + + td.label { + padding: .8em 0 1em 1em; + + span.outkey { + background-color: @ini_background_content; + color: inherit; + font-size: 90%; + + a { + font-size: inherit; + } + } + + label { + line-height: @line-height-big; + } + } + } +} + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1024px */ + +@media @screen_max-md { + #dokuwiki__content { + #config__manager { + td.label { + label { + font-size: @font-size-small; + } + } + + .selectiondefault { + float: none; + max-width: 100%; + width: auto; + + label { + width: 90%; + font-size: @font-size-small; + } + } + } } } From aa81f447a32fdbb4ba3706312efe9ffa4747c32c Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 26 Apr 2017 10:22:05 +0200 Subject: [PATCH 04/10] SPR-908: issuelist in metabox summarized --- css/area_main-sidebar-nav.less | 33 +--------------------------- css/area_nav-metabox.less | 40 +++++++++++++++++++++++++++++++--- css/plugins/magic-matcher.less | 9 -------- 3 files changed, 38 insertions(+), 44 deletions(-) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 822c749..486469e 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -10,9 +10,7 @@ @icon-size: @font-size-big; @menu-margin: @icon-size + @margin-small * 2; - nav > p, - .mmissuelist li, - .mmissuelist div { + nav > p { color: @ini_nav_menu_color; &.noissue { @@ -44,35 +42,6 @@ } } - - /* jira itemlist */ - .mmissuelist { - li { - &.noissue { - list-style-type: none; - margin-left: 0; - } - - a { - display: inline-block; - } - } - - img { - vertical-align: bottom; - margin-right: .3rem; - } - - .mm__status { - padding-left: .3rem; - padding-right: .3rem; - } - - form { - vertical-align: text-top; - } - } - > * { margin-left: @menu-margin; // moves *all* sidebar content to the right diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 7325347..3e64ac8 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -36,6 +36,11 @@ border: 0 none; } + + .msg-area + a { + clear: right; + margin-top: 20px; + } + .tab-container { display: table; @@ -293,8 +298,37 @@ } } - + .msg-area + a { - clear: right; - margin-top: 20px; + +/* + + + + + tab issues + + + + + */ + #spr__tab-issues { + ul.mmissuelist { + padding-left: 0; + margin-top: 1rem; + + li { + &.noissue { + list-style-type: none; + margin-left: 0; + } + + a { + display: inline-block; + } + } + + img { + vertical-align: bottom; + margin-right: .3rem; + } + + .mm__status { + padding-left: .3rem; + padding-right: .3rem; + } + + form { + vertical-align: text-top; + } + } } } diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 3b1687e..e8924fc 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -83,15 +83,6 @@ } -/* + + + + + in meta box + + + + + */ -#spr__tab-issues { - ul.mmissuelist { - padding-left: 0; - margin-top: 1rem; - } -} - - /* + + + + + in content + + + + + */ a.jiralink { font-size: @font-size-default; From 508e7159459a267ab254cb7f28707b1aa18129bb Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 26 Apr 2017 10:41:58 +0200 Subject: [PATCH 05/10] bug in var name --- style.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.ini b/style.ini index f18bae7..2533af0 100755 --- a/style.ini +++ b/style.ini @@ -145,7 +145,7 @@ __nav_menu_color__ = "#696969" ; @ini_nav_menu_color __nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color __nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg -__background __ = "#FFF" ; @ini_background (guaranteed for every plugin) +__background__ = "#FFF" ; @ini_background (guaranteed for every plugin) __text__ = "#252525" ; @ini_text (guaranteed for every plugin) __background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin) From 0b0d2e0829256e315cfe9529c6fabe775f501fed Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 26 Apr 2017 11:47:34 +0200 Subject: [PATCH 06/10] SPR-908: changes for new html --- css/plugins/struct.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/css/plugins/struct.less b/css/plugins/struct.less index 49011a7..0bbbed3 100755 --- a/css/plugins/struct.less +++ b/css/plugins/struct.less @@ -104,8 +104,7 @@ z-index: 3; box-shadow: @box-shadow-bottom; - .hint p { - color: @color-editBox; + p.hint { margin-top: @small-spacing; margin-bottom: @margin-small; } From 6555d67184f8fe7f1192cbc1015f1e94f3ddd8a8 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 26 Apr 2017 12:45:05 +0200 Subject: [PATCH 07/10] SPR-968: qs --- css/plugins/configmanager.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/css/plugins/configmanager.less b/css/plugins/configmanager.less index 404aa06..3a26f10 100644 --- a/css/plugins/configmanager.less +++ b/css/plugins/configmanager.less @@ -39,12 +39,14 @@ } td.label { - padding: .8em 0 1em 1em; + padding: .8em 0 1.2em 1em; span.outkey { background-color: @ini_background; color: inherit; - font-size: 90%; + font-size: (@font-size-small - .06); + font-weight: bold; + padding: 0 @very-small-spacing; a { font-size: inherit; From 3a5352134ffa5ebad56af9d57681a999acd67919 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 26 Apr 2017 12:55:33 +0200 Subject: [PATCH 08/10] =?UTF-8?q?SPR-956:=20Edit-Button=20f=C3=BCr=20Data-?= =?UTF-8?q?Plugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/plugins/data.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/plugins/data.less b/css/plugins/data.less index 56b264a..9d03409 100644 --- a/css/plugins/data.less +++ b/css/plugins/data.less @@ -7,7 +7,7 @@ /* + + + + + global + + + + + */ #dokuwiki__content { - .dataplugin_entry.mitarbeiter.sectionedit2 { + .dataplugin_entry { dl { margin-left: 0; margin-right: 0; From 4cc1b403efab7ed71a8776764afede36af679c25 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 26 Apr 2017 14:54:00 +0200 Subject: [PATCH 09/10] SPR-908: configmanager responsive --- css/plugins/configmanager.less | 78 +++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/css/plugins/configmanager.less b/css/plugins/configmanager.less index 3a26f10..a699ffe 100644 --- a/css/plugins/configmanager.less +++ b/css/plugins/configmanager.less @@ -8,6 +8,8 @@ #dokuwiki__content { #config__manager { fieldset { + min-width: 100%; + overflow-x: auto; box-sizing: border-box; background-color: @background_darker; margin-left: 0; @@ -67,11 +69,84 @@ @media @screen_max-md { #dokuwiki__content { #config__manager { - td.label { + td { + &.label { + label, + span { + font-size: @font-size-small; + } + } + + &.label + td { + font-size: @font-size-small; + + span { + font-size: inherit; + } + } + + select, + input.edit { + font-size: @font-size-small; + } + } + + .selectiondefault { label { font-size: @font-size-small; } } + } + } +} + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 768px */ + +@media @screen_max-sm { + #dokuwiki__content { + #config__manager { + table { + border-top: 0 none; + } + + td { + padding-top: 0; + + &.label { + display: block; + width: 100%; + border: 0 none; + border-top: 1px solid @ini_border; + border-bottom: 0 none; + padding: .8em .5em .3em; + + + span.outkey { + margin-left: 0; + } + } + + .input { + width: 100%; + } + + + &.value, + &.label + td { + display: block; + width: 100%; + border: 0 none; + margin-bottom: 1.2rem; + } + + select, + input.edit { + width: 100%; + text-overflow: ellipsis; + } + } .selectiondefault { float: none; @@ -80,7 +155,6 @@ label { width: 90%; - font-size: @font-size-small; } } } From 92a2b4dc7e378dc9555ce8e0d22df92713799bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Wed, 26 Apr 2017 16:56:14 +0200 Subject: [PATCH 10/10] convention uppercase letters for rgb hex values --- style.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/style.ini b/style.ini index 2533af0..4dc2e5d 100755 --- a/style.ini +++ b/style.ini @@ -148,16 +148,16 @@ __nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg __background__ = "#FFF" ; @ini_background (guaranteed for every plugin) __text__ = "#252525" ; @ini_text (guaranteed for every plugin) -__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin) +__background_neu__ = "#FFF" ; @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 +__border_light__ = "#DADADA" ; @ini_border_light __background_page_footer__ = "#252525" ; @ini_background_page_footer ; highlighted text (e.g. search snippets) -__highlight__ = "#efefef" ; @ini_highlight (guaranteed for every plugin) +__highlight__ = "#EFEFEF" ; @ini_highlight (guaranteed for every plugin) __highlight_text__ = "#252525" ; @ini_highlight_text @@ -171,12 +171,12 @@ __link__ = "#286DA8" ; @ini_link __button_color__ = "#FFF" ; @ini_button_color __button_background__ = "#286DA8" ; @ini_button_background -__background_alt__ = "#f6f6f6" ; @ini_background_alt (guaranteed for every plugin) +__background_alt__ = "#F6F6F6" ; @ini_background_alt (guaranteed for every plugin) __text_alt__ = "#454545" ; @ini_text_alt (guaranteed for every plugin) ; border color -__border__ = "#bbbbbb" ; @ini_border (guaranteed for every plugin) +__border__ = "#BBB" ; @ini_border (guaranteed for every plugin) __default_border_radius__ = "3px" ; @ini_default_border_radius