From ac628d80ed1fc2003b4f4ef6e6897d9c9235ae83 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 26 Oct 2012 00:09:31 +0100 Subject: added cut off points for mobile devices as parameters to style.ini --- lib/tpl/dokuwiki/css/mobile.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 501e53a54..88333c012 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -11,9 +11,9 @@ z-index: 0; } -/* up to 979px screen widths +/* for screen widths in the tablet range ********************************************************************/ -@media only screen and (max-width: 979px) { +@media only screen and (max-width: __tablet_width__) { #screen__mode { z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ @@ -113,9 +113,9 @@ } /* /@media */ -/* up to 480px screen widths +/* for screen widths in the smartphone range ********************************************************************/ -@media only screen and (max-width: 480px) { +@media only screen and (max-width: __phone_width__) { #screen__mode { z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ -- cgit v1.2.3 From 1a40fc9935bd06a440a844e081e4bfce5fce2932 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 26 Jan 2013 19:23:16 +0000 Subject: fixed issue with pagetools over tabs --- lib/tpl/dokuwiki/css/pagetools.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index a40d525b3..60dc43fb1 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -53,6 +53,7 @@ padding: 0; /* add transparent border to prevent jumping when proper border is added on hover */ border: 1px solid transparent; + z-index: 10; } [dir=rtl] #dokuwiki__pagetools ul { right: auto; -- cgit v1.2.3 From 44ac4ea5e7e5d2f9e2a78fc1efda9557e1da54a2 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 30 Jan 2013 20:16:50 +0000 Subject: line up remember me checkbox with the text input fields --- lib/tpl/dokuwiki/css/_forms.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 3c7172226..dca7cd2e9 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -67,6 +67,15 @@ .dokuwiki button.button { vertical-align: middle; } +/** + * Styles for auth forms + */ + +#dw__login label[for="remember__me"] { + margin-left: 50%; + margin-bottom: 1.5em; +} + /** * Styles for the subscription page -- cgit v1.2.3 From 1ff4a6049ec22ec70e18769421425b8ae405cd42 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 30 Jan 2013 20:19:27 +0000 Subject: reduce the content region width on auth forms (profile, login, register & resend password) to match the fieldset --- lib/tpl/dokuwiki/css/_forms.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index dca7cd2e9..6d2958fbb 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -71,6 +71,15 @@ * Styles for auth forms */ +.mode_profile #dokuwiki__content .page, +.mode_login #dokuwiki__content .page, +.mode_resendpwd #dokuwiki__content .page, +.mode_register #dokuwiki__content .page { + width: 402px; + padding-right: 2em; + margin-left: auto; + margin-right: auto; +} #dw__login label[for="remember__me"] { margin-left: 50%; margin-bottom: 1.5em; -- cgit v1.2.3 From ea2b8251313898834df54d54477f9f85c498ab30 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 30 Jan 2013 20:20:16 +0000 Subject: put some whitespace between form submit button and fieldset bottom border --- lib/tpl/dokuwiki/css/_forms.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 6d2958fbb..13eaee0fc 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -84,6 +84,11 @@ margin-left: 50%; margin-bottom: 1.5em; } +#dw__login fieldset, +#dw__resendpwd fieldset, +#dw__register fieldset { + padding-bottom: 1em; +} /** -- cgit v1.2.3 From bfba88b5a7fffa4e095eedc5ea129173fd4a5611 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 30 Jan 2013 20:38:16 +0000 Subject: unwind the width narrowing commit --- lib/tpl/dokuwiki/css/_forms.css | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 13eaee0fc..f77bcc626 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -70,16 +70,6 @@ /** * Styles for auth forms */ - -.mode_profile #dokuwiki__content .page, -.mode_login #dokuwiki__content .page, -.mode_resendpwd #dokuwiki__content .page, -.mode_register #dokuwiki__content .page { - width: 402px; - padding-right: 2em; - margin-left: auto; - margin-right: auto; -} #dw__login label[for="remember__me"] { margin-left: 50%; margin-bottom: 1.5em; -- cgit v1.2.3 From 04f76e04dfd64683d1efe8bcde883900eae7515a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 3 Feb 2013 13:14:12 +0000 Subject: basic styles improvements --- lib/tpl/dokuwiki/css/basic.css | 76 +++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 20 deletions(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 8b7447239..8e14dde3b 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -28,15 +28,20 @@ body { /*____________ headers ____________*/ +caption, +figcaption, +summary, +legend { + padding: 0; + margin: 0 0 .35em; + line-height: 1.2; +} h1, h2, h3, h4, h5, -h6, -caption, -legend { - font-family: Arial, sans-serif; +h6 { font-weight: bold; padding: 0; line-height: 1.2; @@ -47,9 +52,7 @@ legend { [dir=rtl] h3, [dir=rtl] h4, [dir=rtl] h5, -[dir=rtl] h6, -[dir=rtl] caption, -[dir=rtl] legend { +[dir=rtl] h6 { clear: right; } @@ -90,6 +93,8 @@ pre, table, hr, blockquote, +figure, +details, fieldset, address { margin: 0 0 1.4em 0; /* bottom margin = line-height */ @@ -161,7 +166,6 @@ table { caption { caption-side: top; text-align: left; - margin: 0 0 .3em; } [dir=rtl] caption { text-align: right; @@ -173,13 +177,12 @@ td { margin: 0; vertical-align: top; border: 1px solid __border__; - text-align: left; } th { font-weight: bold; background-color: __background_alt__; + text-align: left; } -[dir=rtl] td, [dir=rtl] th { text-align: right; } @@ -216,11 +219,15 @@ img { height: auto; } img, -object { +object, +embed, +iframe, +video, +audio { max-width: 100%; } -/* IE8 and below won't display the images otherwise */ -button img { +#IE7 img, +#IE8 img { max-width: none; } @@ -229,7 +236,6 @@ hr { border-bottom: solid __background__; border-width: 1px 0; height: 0; - width: 100%; text-align: center; clear: both; } @@ -241,6 +247,11 @@ abbr { font-style: normal; } +mark { + background: __highlight__; + color: inherit; +} + pre, code, samp, @@ -289,6 +300,10 @@ sup { vertical-align: super; } +small { + font-size: .8em; +} + /*____________ forms ____________*/ /* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */ @@ -299,9 +314,13 @@ form { padding: 0; } fieldset { - padding: 1em 1em 0; + padding: .7em 1em 0; + padding: .7rem 1rem; /* for those browsers understanding :last-child */ border: 1px solid __text_alt__; } +fieldset > :last-child { + margin-bottom: 0; +} legend { margin: 0; padding: 0 .1em; @@ -316,12 +335,16 @@ textarea, button, select, optgroup, -option { +option, +keygen, +output, +meter, +progress { font: inherit; font-weight: normal; color: #333; background-color: #fff; - line-height: 1; + line-height: normal; margin: 0; vertical-align: middle; -moz-box-sizing: border-box; @@ -340,7 +363,8 @@ option { input, textarea, -select { +select, +keygen { border: 1px solid #ccc; box-shadow: inset 0 0 1px #eee; border-radius: 2px; @@ -350,11 +374,14 @@ input:focus, textarea:active, textarea:focus, select:active, -select:focus { +select:focus, +keygen:active, +keygen:focus { border-color: #999; } input[type=radio], -input[type=checkbox] { +input[type=checkbox], +input[type=image] { padding: 0; border-style: none; box-shadow: none; @@ -362,6 +389,8 @@ input[type=checkbox] { /* all types of buttons */ input[type=submit], +input[type=button], +input[type=reset], input.button, a.button, button, @@ -382,11 +411,18 @@ button, #IE7 input.button, #IE7 button { line-height: 1.4; + overflow: visible; } input[type=submit]:hover, input[type=submit]:active, input[type=submit]:focus, +input[type=button]:hover, +input[type=button]:active, +input[type=button]:hover, +input[type=reset]:hover, +input[type=reset]:active, +input[type=reset]:hover, input.button:hover, input.button:active, input.button:focus, -- cgit v1.2.3 From 264643e6c38cdf7f423c404c10bb63d0e7d7a5c4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 3 Feb 2013 16:09:47 +0000 Subject: improved print styles (includes fixes for FS#2645 and FS#2707) --- lib/tpl/dokuwiki/css/print.css | 95 +++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 38 deletions(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index d30bc6c91..e0eaab848 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -5,18 +5,19 @@ */ body { - /* - font: normal 12pt/1.2 serif; - color: #000; + font: normal 87.5%/1.3 Garamond, Baskerville, "Hoefler Text", "Nimbus Roman No9 L", serif; background-color: #fff; - */ + color: #000; } /* hide certain sections */ .a11y, +audio, +video, #dokuwiki__header .tools, #dokuwiki__aside, .dokuwiki .breadcrumbs, +.dokuwiki .pageId, #dw__toc, h3.toggle, #dokuwiki__pagetools, @@ -24,37 +25,38 @@ h3.toggle, display: none; } -.dokuwiki h1, -.dokuwiki h2, -.dokuwiki h3, -.dokuwiki h4, -.dokuwiki h5, -.dokuwiki caption, -.dokuwiki legend { +h1, +h2, +h3, +h4, +h5, +caption, +legend { clear: both; } -.dokuwiki ul { +ul { list-style: disc outside; } -.dokuwiki ol { +ol { list-style: decimal outside; } -.dokuwiki ol ol { +ol ol { list-style-type: lower-alpha; } -.dokuwiki ol ol ol { +ol ol ol { list-style-type: upper-roman; } -.dokuwiki ol ol ol ol { +ol ol ol ol { list-style-type: upper-alpha; } -.dokuwiki ol ol ol ol ol { +ol ol ol ol ol { list-style-type: lower-roman; } -.dokuwiki a:link, -.dokuwiki a:visited { - text-decoration: underline; +a:link, +a:visited { + text-decoration: none; + border-bottom: 1pt dotted; color: #333; background-color: inherit; } @@ -68,33 +70,37 @@ a.mail:after { } /* code blocks */ -.dokuwiki pre { +pre { font-family: monospace; } -.dokuwiki dl.code dt, -.dokuwiki dl.file dt { +dl.code dt, +dl.file dt { + font-weight: bold; +} + +mark { font-weight: bold; } /* images */ -.dokuwiki img { +img { border-width: 0; vertical-align: middle; } -.dokuwiki img.media { +img.media { margin: .2em 0; } -.dokuwiki img.medialeft { +img.medialeft { margin: .2em 1em .2em 0; } -.dokuwiki img.mediaright { +img.mediaright { margin: .2em 0 .2em 1em; } -.dokuwiki img.mediacenter { +img.mediacenter { margin: .2em auto; } -.dokuwiki blockquote { +blockquote { padding: 0 10pt; margin: 0; border: solid #ccc; @@ -105,27 +111,26 @@ a.mail:after { } /* tables */ -.dokuwiki table { +table { border-collapse: collapse; empty-cells: show; border-spacing: 0; border: 1pt solid #ccc; } -.dokuwiki th, -.dokuwiki td { +th, +td { padding: 3pt 5pt; margin: 0; vertical-align: top; border: 1pt solid #666; +} +th { + font-weight: bold; text-align: left; } -[dir=rtl] .dokuwiki th, -[dir=rtl] .dokuwiki td { +[dir=rtl] th { text-align: right; } -.dokuwiki th { - font-weight: bold; -} /*____________ a bit of layout ____________*/ @@ -138,6 +143,7 @@ a.mail:after { } #dokuwiki__header h1 a { text-decoration: none; + border-width: 0; } #dokuwiki__header h1 img { float: left; @@ -148,8 +154,21 @@ a.mail:after { margin-right: 0; margin-left: .5em; } + .dokuwiki div.footnotes { clear: both; - border-top: 1pt solid #000; + border-top: 1pt dotted #999; margin-top: 10pt; } + +.dokuwiki div.docInfo { + font-size: 90%; + text-align: right; + clear: both; + padding-top: 2pt; + border-top: 1pt solid #999; + margin-top: 10pt; +} +[dir=rtl] .dokuwiki div.docInfo { + text-align: left; +} -- cgit v1.2.3 From 16c8df01fd51b6af5b625a57d9e13df6465ce558 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 3 Feb 2013 16:20:34 +0000 Subject: fixed acronyms in italics (FS#2684) --- lib/tpl/dokuwiki/css/basic.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 8e14dde3b..d58ed9edd 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -246,9 +246,13 @@ abbr { border-bottom: 1px dotted; font-style: normal; } +em acronym, +em abbr { + font-style: italic; +} mark { - background: __highlight__; + background-color: __highlight__; color: inherit; } -- cgit v1.2.3 From 0859da571a3f1dee86823d03630d86bcd4cde149 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 3 Feb 2013 16:35:33 +0000 Subject: added missing styling for disabled form elements (FS#2705) --- lib/tpl/dokuwiki/css/basic.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index d58ed9edd..cb41db179 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -455,7 +455,13 @@ button::-moz-focus-inner { input[disabled], button[disabled], +select[disabled], +textarea[disabled], input[readonly], -button[readonly] { +button[readonly], +select[readonly], +textarea[readonly] { cursor: auto; + opacity: .5; + background-color: #eee; } -- cgit v1.2.3 From 16ff96a17f494a4c0f38bf133a7a797684524e68 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 3 Feb 2013 16:40:08 +0000 Subject: re-added linear gradients for firefox We removed them because of FS#2447 a while ago. But as the original problem was most probably only caused by the gradient for the page background and that's using a PNG now, the gradients for the buttons should be fine. Please test to double check if this change causes performance problems in Firefox. --- lib/tpl/dokuwiki/css/basic.css | 4 ++-- lib/tpl/dokuwiki/css/content.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index cb41db179..a0a60d295 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -402,7 +402,7 @@ button, color: #333; background-color: #eee; background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); - /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/ + background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); @@ -440,7 +440,7 @@ button:focus, border-color: #999; background-color: #ddd; background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); - /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/ + background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index c23612643..119859e38 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -121,7 +121,7 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { background-color: __background_site__; - /* background: -moz-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); see FS#2447 */ + background: -moz-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%); background: -o-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); background: -ms-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); -- cgit v1.2.3 From b84f9471f10fdedda027e8cecc0dead172ef188f Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 3 Feb 2013 19:48:58 +0000 Subject: adjust spacing to match standard 1.4em grid --- lib/tpl/dokuwiki/css/_forms.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index f77bcc626..6744750ba 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -72,12 +72,12 @@ */ #dw__login label[for="remember__me"] { margin-left: 50%; - margin-bottom: 1.5em; + margin-bottom: 1.4em; } #dw__login fieldset, #dw__resendpwd fieldset, #dw__register fieldset { - padding-bottom: 1em; + padding-bottom: 0.7em; } -- cgit v1.2.3 From 8a65ef2ef3046b80d45c36abc561cef3ae6ec1b7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 16 Feb 2013 13:49:47 +0000 Subject: fixed edit toolbar being cut off (FS#2715) --- lib/tpl/dokuwiki/css/_edit.css | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index 0c66c75b7..92ce62126 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -13,7 +13,6 @@ .dokuwiki div.toolbar { margin-bottom: .5em; - overflow: hidden; } #draft__status { float: right; -- cgit v1.2.3 From 56133a04d1c5dcd4825f4c0c978b8a9336d603d0 Mon Sep 17 00:00:00 2001 From: Tom N Harris Date: Sat, 16 Feb 2013 18:15:13 -0500 Subject: Fix width of indicator column. --- lib/tpl/dokuwiki/css/_diff.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css index 62f831213..58c24b5c7 100644 --- a/lib/tpl/dokuwiki/css/_diff.css +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -21,7 +21,6 @@ .dokuwiki table.diff th { border-bottom: 1px solid __border__; font-size: 110%; - width: 50%; font-weight: normal; } .dokuwiki table.diff th a { @@ -37,8 +36,19 @@ .dokuwiki table.diff th.minor { color: #999; } +.dokuwiki table.diff_sidebyside th { + width: 50%; +} /* table body */ +.dokuwiki table.diff .diff-lineheader { + width: .7em; + text-align: right; +} +[dir=rtl] .dokuwiki table.diff .diff-lineheader { + text-align: left; +} +.dokuwiki table.diff .diff-lineheader, .dokuwiki table.diff td { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; } -- cgit v1.2.3 From 8770796f2519e41d394b3d774bc831b9315e10a8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 24 Feb 2013 19:10:48 +0000 Subject: make scrolling possible in media manager on smaller screens (FS#2723) --- lib/tpl/dokuwiki/css/mobile.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 88333c012..e1d4dda72 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -89,6 +89,10 @@ .dokuwiki div.page { padding: 1em; } +/* enable horizontal scrolling in media manager */ +.mode_media div.page { + overflow: auto; +} /* _edit */ .dokuwiki div.section_highlight { -- cgit v1.2.3 From aaec90e43993614263ee747a827f0c8555698958 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Mon, 25 Feb 2013 00:42:45 +0100 Subject: Fix search button in rtl languages in Chrome For some reason without position: relative the search button is hidden in rtl languages. --- lib/tpl/dokuwiki/css/design.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 2c2109228..2eb357a59 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -205,6 +205,7 @@ background-position: 5px 0; margin-left: 0; margin-right: -20px; + position: relative; } #dokuwiki__sitetools ul { -- cgit v1.2.3 From 058fd09655df42c72f3c447e3b9561e4909e978d Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Mon, 25 Feb 2013 00:45:46 +0100 Subject: Fix current mode icons in rtl languages --- lib/tpl/dokuwiki/css/pagetools.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index 60dc43fb1..0c31e283f 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -222,7 +222,7 @@ [dir=rtl] #dokuwiki__pagetools ul li a.revs:hover, [dir=rtl] #dokuwiki__pagetools ul li a.revs:active, [dir=rtl] #dokuwiki__pagetools ul li a.revs:focus, -.mode_revisions [dir=rtl] #dokuwiki__pagetools ul li a.revs { +[dir=rtl] .mode_revisions #dokuwiki__pagetools ul li a.revs { background-position: left -585px; } @@ -241,7 +241,7 @@ [dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover, [dir=rtl] #dokuwiki__pagetools ul li a.backlink:active, [dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus, -.mode_backlink [dir=rtl] #dokuwiki__pagetools ul li a.backlink { +[dir=rtl] .mode_backlink #dokuwiki__pagetools ul li a.backlink { background-position: left -675px; } @@ -277,7 +277,7 @@ [dir=rtl] #dokuwiki__pagetools ul li a.revert:hover, [dir=rtl] #dokuwiki__pagetools ul li a.revert:active, [dir=rtl] #dokuwiki__pagetools ul li a.revert:focus, -.mode_revert [dir=rtl] #dokuwiki__pagetools ul li a.revert { +[dir=rtl] .mode_revert #dokuwiki__pagetools ul li a.revert { background-position: left -495px; } @@ -296,7 +296,7 @@ [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover, [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active, [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus, -.mode_subscribe [dir=rtl] #dokuwiki__pagetools ul li a.subscribe { +[dir=rtl] .mode_subscribe #dokuwiki__pagetools ul li a.subscribe { background-position: left -765px; } -- cgit v1.2.3 From c97b0f20e860cdd8e4dbb72b14ca1588ec7abda1 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Mon, 25 Feb 2013 00:55:01 +0100 Subject: Fix pagetools display without images FS#2634 This makes the pagetools in non-hover/static/active-mode use another image replacement technique that falls back to the text when images are disabled. Furthermore this fixes the :focused-display in IE7 by using :active, too. --- lib/tpl/dokuwiki/css/pagetools.css | 97 ++++++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 15 deletions(-) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index 0c31e283f..41f876d48 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -72,43 +72,65 @@ display: block; min-height: 20px; /* 30 - 2x5 */ line-height: 20px; - padding: 5px 40px 5px 5px; - background-image: url(images/pagetools-sprite.png); + padding: 0; background-position: right 0; background-repeat: no-repeat; /* add transparent border to prevent jumping when proper border is added on focus */ border: 1px solid transparent; white-space: nowrap; + width: 30px; + height: 30px; + overflow: hidden; + margin-left: auto; /* align right if the ul is larger because one item is focused */ } -[dir=rtl] #dokuwiki__pagetools ul li a { - padding: 5px 5px 5px 40px; - background-position: left 0; + +#dokuwiki__pagetools ul li a:before { + content: url(images/pagetools-sprite.png); + display: inline-block; + font-size: 0; + line-height: 0; } -/* hide labels accessibly when neither on hover nor on focus */ -#dokuwiki__pagetools ul li a span { - position: absolute; - clip: rect(0 0 0 0); /* IE7, IE6 */ - clip: rect(0, 0, 0, 0); +[dir=rtl] #dokuwiki__pagetools ul li a { + background-position: left 0; + margin-right: auto; + margin-left: 0; } /* show all tools on hover and individual tools on focus */ #dokuwiki__pagetools:hover ul, -#dokuwiki__pagetools ul li a:focus { +#dokuwiki__pagetools ul li a:focus, +#dokuwiki__pagetools ul li a:active { background-color: __background__; border-color: __border__; border-radius: 2px; box-shadow: 2px 2px 2px __text_alt__; } + +#dokuwiki__pagetools:hover ul li a, +#dokuwiki__pagetools ul li a:focus, +#dokuwiki__pagetools ul li a:active { + width: auto; + height: auto; + overflow: visible; + padding: 5px 40px 5px 5px; + background-image: url(images/pagetools-sprite.png); +} + +#dokuwiki__pagetools:hover ul li a:before, +#dokuwiki__pagetools ul li a:focus:before { + content: none; +} + [dir=rtl] #dokuwiki__pagetools:hover ul, [dir=rtl] #dokuwiki__pagetools ul li a:focus { box-shadow: -2px 2px 2px __text_alt__; } -#dokuwiki__pagetools:hover ul li a span, -#dokuwiki__pagetools ul li a:focus span { - display: inline; - position: static; +[dir=rtl] #dokuwiki__pagetools:hover li a, +[dir=rtl] #dokuwiki__pagetools ul li a:focus, +[dir=rtl] #dokuwiki__pagetools ul li a:active { + padding: 5px 5px 5px 40px; } #dokuwiki__pagetools ul li a:hover, @@ -139,6 +161,9 @@ background-position: left -45px; } +#dokuwiki__pagetools ul li a.create:before { + margin-top: -90px; +} #dokuwiki__pagetools ul li a.create { background-position: right -90px; } @@ -159,6 +184,9 @@ #dokuwiki__pagetools ul li a.show { background-position: right -270px; } +#dokuwiki__pagetools ul li a.show:before { + margin-top: -270px; +} #dokuwiki__pagetools ul li a.show:hover, #dokuwiki__pagetools ul li a.show:active, #dokuwiki__pagetools ul li a.show:focus { @@ -176,6 +204,9 @@ #dokuwiki__pagetools ul li a.source { background-position: right -360px; } +#dokuwiki__pagetools ul li a.source:before { + margin-top: -360px; +} #dokuwiki__pagetools ul li a.source:hover, #dokuwiki__pagetools ul li a.source:active, #dokuwiki__pagetools ul li a.source:focus { @@ -193,6 +224,9 @@ #dokuwiki__pagetools ul li a.draft { background-position: right -180px; } +#dokuwiki__pagetools ul li a.draft:before { + margin-top: -180px; +} #dokuwiki__pagetools ul li a.draft:hover, #dokuwiki__pagetools ul li a.draft:active, #dokuwiki__pagetools ul li a.draft:focus { @@ -210,12 +244,18 @@ #dokuwiki__pagetools ul li a.revs { background-position: right -540px; } +#dokuwiki__pagetools ul li a.revs:before { + margin-top: -540px; +} #dokuwiki__pagetools ul li a.revs:hover, #dokuwiki__pagetools ul li a.revs:active, #dokuwiki__pagetools ul li a.revs:focus, .mode_revisions #dokuwiki__pagetools ul li a.revs { background-position: right -585px; } +.mode_revisions #dokuwiki__pagetools ul li a.revs:before { + margin-top: -585px; +} [dir=rtl] #dokuwiki__pagetools ul li a.revs { background-position: left -540px; } @@ -229,12 +269,18 @@ #dokuwiki__pagetools ul li a.backlink { background-position: right -630px; } +#dokuwiki__pagetools ul li a.backlink:before { + margin-top: -630px; +} #dokuwiki__pagetools ul li a.backlink:hover, #dokuwiki__pagetools ul li a.backlink:active, #dokuwiki__pagetools ul li a.backlink:focus, .mode_backlink #dokuwiki__pagetools ul li a.backlink { background-position: right -675px; } +.mode_backlink #dokuwiki__pagetools ul li a.backlink:before { + margin-top: -675px; +} [dir=rtl] #dokuwiki__pagetools ul li a.backlink { background-position: left -630px; } @@ -248,6 +294,9 @@ #dokuwiki__pagetools ul li a.top { background-position: right -810px; } +#dokuwiki__pagetools ul li a.top:before{ + margin-top: -810px; +} #dokuwiki__pagetools ul li a.top:hover, #dokuwiki__pagetools ul li a.top:active, #dokuwiki__pagetools ul li a.top:focus { @@ -265,12 +314,18 @@ #dokuwiki__pagetools ul li a.revert { background-position: right -450px; } +#dokuwiki__pagetools ul li a.revert:before { + margin-top: -450px; +} #dokuwiki__pagetools ul li a.revert:hover, #dokuwiki__pagetools ul li a.revert:active, #dokuwiki__pagetools ul li a.revert:focus, .mode_revert #dokuwiki__pagetools ul li a.revert { background-position: right -495px; } +.mode_revert #dokuwiki__pagetools ul li a.revert:before { + margin-top: -450px; +} [dir=rtl] #dokuwiki__pagetools ul li a.revert { background-position: left -450px; } @@ -284,12 +339,18 @@ #dokuwiki__pagetools ul li a.subscribe { background-position: right -720px; } +#dokuwiki__pagetools ul li a.subscribe:before { + margin-top: -720px; +} #dokuwiki__pagetools ul li a.subscribe:hover, #dokuwiki__pagetools ul li a.subscribe:active, #dokuwiki__pagetools ul li a.subscribe:focus, .mode_subscribe #dokuwiki__pagetools ul li a.subscribe { background-position: right -765px; } +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe:before { + margin-top: -765px; +} [dir=rtl] #dokuwiki__pagetools ul li a.subscribe { background-position: left -720px; } @@ -303,6 +364,9 @@ #dokuwiki__pagetools ul li a.mediaManager { background-position: right -900px; } +#dokuwiki__pagetools ul li a.mediaManager:before { + margin-top: -900px; +} #dokuwiki__pagetools ul li a.mediaManager:hover, #dokuwiki__pagetools ul li a.mediaManager:active, #dokuwiki__pagetools ul li a.mediaManager:focus { @@ -320,6 +384,9 @@ #dokuwiki__pagetools ul li a.back { background-position: right -990px; } +#dokuwiki__pagetools ul li a.back { + margin-top: -990px; +} #dokuwiki__pagetools ul li a.back:hover, #dokuwiki__pagetools ul li a.back:active, #dokuwiki__pagetools ul li a.back:focus { -- cgit v1.2.3 From 96e1f756daa0ff09e8a68c74a6fc4f606a723f77 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Mon, 25 Feb 2013 00:56:37 +0100 Subject: Use "old" image replacement for pagetools in IE7 This fixes the image display in IE7 with the disadvantage that now in IE7 with images disabled the text won't be displayed anymore. --- lib/tpl/dokuwiki/css/pagetools.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'lib/tpl/dokuwiki/css') diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index 41f876d48..21e5c13ec 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -133,6 +133,25 @@ padding: 5px 5px 5px 40px; } +/* IE7 fixes, doesn't work without images */ + +#IE7 #dokuwiki__pagetools ul li a { + background-image: url(images/pagetools-sprite.png); +} + +#IE7 #dokuwiki__pagetools:hover ul li a span, +#IE7 #dokuwiki__pagetools ul li a:focus span, +#IE7 #dokuwiki__pagetools ul li a:active span { + clip: auto; + display: inline; + position: static; +} + +#IE7 #dokuwiki__pagetools ul li a span { + clip: rect(0 0 0 0); + position: absolute; +} + #dokuwiki__pagetools ul li a:hover, #dokuwiki__pagetools ul li a:active, #dokuwiki__pagetools ul li a:focus { -- cgit v1.2.3