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