From 269c5e83e113d374dbcb4c8199d54422a48e97f1 Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Mon, 31 Dec 2007 23:51:53 +0000 Subject: [PATCH] Revert last commit, unintended things were committed. --- RELEASE-NOTES | 1 - includes/Linker.php | 2 +- includes/SpecialUserrights.php | 2 -- languages/messages/MessagesEn.php | 1 - skins/MonoBook.php | 2 +- skins/chick/main.css | 38 +++++++++++++------------- skins/common/cologneblue.css | 5 ++-- skins/common/oldshared.css | 22 ++++++++++++++++ skins/common/shared.css | 16 ++++------- skins/monobook/main.css | 30 ++++++++++----------- skins/simple/main.css | 44 ++++++++++++++++++++----------- 11 files changed, 92 insertions(+), 71 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 776e79a543..501305a980 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -112,7 +112,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Add HTML ID's mw-read-only-warning and mw-anon-edit-warning to warnings when editing to allow CSS styling. * Parser now returns list of sections -* Add userrights-text message to display at all times on Special:Userrights. === Bug fixes in 1.12 === diff --git a/includes/Linker.php b/includes/Linker.php index aeb4f68f5b..17e988b4db 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1225,7 +1225,7 @@ class Linker { * @return string HTML headline */ public function makeHeadline( $level, $attribs, $anchor, $text, $link ) { - return "
$link
"; + return "$text"; } /** diff --git a/includes/SpecialUserrights.php b/includes/SpecialUserrights.php index f19fe1d8bd..0394b7d85e 100644 --- a/includes/SpecialUserrights.php +++ b/includes/SpecialUserrights.php @@ -232,8 +232,6 @@ class UserrightsForm extends HTMLForm { */ function switchForm() { global $wgOut, $wgRequest; - $wgOut->addWikiText( wfMsg( 'userrights-text' ) ); - $username = $wgRequest->getText( 'user-editname' ); $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->action, 'name' => 'uluser' ) ); $form .= '
' . wfMsgHtml( 'userrights-lookup-user' ) . ''; diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 1cafdd9594..861f080db2 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1343,7 +1343,6 @@ Unselected groups will not be changed. You can deselect a group with CTRL + Left 'userrights-nodatabase' => 'Database $1 does not exist or is not local.', 'userrights-nologin' => 'You must [[Special:Userlogin|log in]] with an administrator account to assign user rights.', 'userrights-notallowed' => 'Your account does not have permission to assign user rights.', -'userrights-text' => '', # don't translate or duplicate this message to other languages # Groups 'group' => 'Group:', diff --git a/skins/MonoBook.php b/skins/MonoBook.php index fa6b3c2ad4..e930a5e7ad 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -98,7 +98,7 @@ class MonoBookTemplate extends QuickTemplate {
data['sitenotice']) { ?>
html('sitenotice') ?>
-

data['displaytitle']!=""?$this->html('title'):$this->text('title') ?>

+

data['displaytitle']!=""?$this->html('title'):$this->text('title') ?>

msg('tagline') ?>

html('subtitle') ?>
diff --git a/skins/chick/main.css b/skins/chick/main.css index 236feac0ef..07b922c37e 100644 --- a/skins/chick/main.css +++ b/skins/chick/main.css @@ -41,35 +41,33 @@ hr { margin: 0.2em 0 0.2em 0; } -/* Headers */ -.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { - color: black; - background: none; - margin: 0; - border-bottom: 1px solid #aaa; -} -.mw-h3, .mw-h4, .mw-h5, .mw-h6 { - border-bottom: none; +h1, h2, h3, h4, h5, h6 { + color: Black; + background: none; + font-weight: normal; + margin: 0; + padding-top: 0.5em; + padding-bottom: 0.17em; + border-bottom: 1px solid #aaaaaa; } -h1, h2 { +.editsection { font-weight: normal; } h1 { font-size: 188%; } +h1 .editsection { font-size: 53.2%; } h2 { font-size: 150%; } +h2 .editsection { font-size: 66.7%; } +h3, h4, h5, h6 { + border-bottom: none; + font-weight: bold; +} h3 { font-size: 132%; } +h3 .editsection { font-size: 75.8%; } h4 { font-size: 116%; } +h4 .editsection { font-size: 86.2%; } h5 { font-size: 100%; } h6 { font-size: 80%; } - -/* To replicate the old padding, where h# were block-level elements and edit - * links were floated, we need to multiply .5em top padding and .17em bottom - * padding by the header text sizes. */ -.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */ -.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */ -.mw-h3 { padding: .66em 0 .22em; } /* etc. */ -.mw-h4 { padding: .58em 0 .20em; } -.mw-h5 { padding: .50em 0 .17em; } -.mw-h6 { padding: .40em 0 .14em; } +h6 .editsection { font-size: 125%; } ul { line-height: 1.5em; diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css index 8613b5f001..670996ea38 100644 --- a/skins/common/cologneblue.css +++ b/skins/common/cologneblue.css @@ -78,6 +78,7 @@ h1 { font-family: Verdana, Arial, sans-serif; font-size: 180%; line-height: 21pt; } +h1 .editsection { font-size: 55.6%; } h1.pagetitle { padding-bottom: 0; margin-bottom: 0; } #article p.subtitle { color: #666666; font-size: 11pt; font-weight: bold; @@ -90,7 +91,7 @@ a:visited { color: #8D0749; } a.printable { text-decoration: underline; } a.stub, #quickbar a.stub { color:#772233; text-decoration:none; } a.new, #quickbar a.new { color: #CC2200; } -.mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { margin-bottom: 0; } +h2, h3, h4, h5, h6 { margin-bottom: 0; } small { font-size: 75%; } input.mw-searchInput { width: 106px; } @@ -105,4 +106,4 @@ div#mw-recreate-deleted-warn { div#mw-upload-deleted-warn ul li, div#mw-recreate-deleted-warn ul li { font-size: 90%; -} +} \ No newline at end of file diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css index 4559cd32ed..ead422dc78 100644 --- a/skins/common/oldshared.css +++ b/skins/common/oldshared.css @@ -4,6 +4,28 @@ * CologneBlue, the old pre-Monobook skins */ +/* For clarity, explicitly state some recommendations from to make sure the editsection links scale right */ + +h1 { font-size: 2em; } +h2 { font-size: 1.5em; } +h3 { font-size: 1.17em; } +h5 { font-size: .83em; } +h6 { font-size: .75em; } +h1, h2, h3, h4, h5, h6 { font-weight: bolder } + +/* Now the custom parts */ + +/* Make edit sections (which are inside h# tags) normal-sized */ +.editsection { + font-weight: normal; +} +h1 .editsection { font-size: 50% } +h2 .editsection { font-size: 66.7% } +h3 .editsection { font-size: 85.5% } +h5 .editsection { font-size: 120% } +h6 .editsection { font-size: 133% } + #footer { clear: both } /* images */ div.floatright { float: right; clear: right; margin: 0 0 1em 1em; } diff --git a/skins/common/shared.css b/skins/common/shared.css index ef5c926c9c..61f68395f0 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -19,17 +19,11 @@ div#mw-js-message { background-color: #fcfcfc; } -/* Display headings on the same line as edit link */ -h1, h2, h3, h4, h5, h6 { display: inline; margin: 0; } -/* But then we have to reintroduce the margin. We use the W3 recommended mar- - * gins , multiplying by the recom- - * mended font-size. */ -.mw-h1 { margin: 1.34em 0; } -.mw-h2 { margin: 1.13em 0; } -.mw-h3 { margin: 0.97em 0; } -.mw-h4 { margin: 1.12em 0; } -.mw-h5 { margin: 1.25em 0; } -.mw-h6 { margin: 1.25em 0; } +/* Edit section links */ +.editsection { + float: right; + margin-left: 5px; +} /** * File histories diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 394a8fbd62..02cc9c9f9b 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -111,33 +111,31 @@ hr { margin: .2em 0 .2em 0; } -/* Headers */ -.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { +h1, h2, h3, h4, h5, h6 { color: black; background: none; + font-weight: normal; margin: 0; + padding-top: .5em; + padding-bottom: .17em; border-bottom: 1px solid #aaa; } -.mw-h3, .mw-h4, .mw-h5, .mw-h6 { - border-bottom: none; -} -h1, h2 { font-weight: normal; } h1 { font-size: 188%; } +h1 .editsection { font-size: 53%; } h2 { font-size: 150%; } +h2 .editsection { font-size: 67%; } +h3, h4, h5, h6 { + border-bottom: none; + font-weight: bold; +} h3 { font-size: 132%; } +h3 .editsection { font-size: 76%; font-weight: normal; } h4 { font-size: 116%; } +h4 .editsection { font-size: 86%; font-weight: normal; } h5 { font-size: 100%; } +h5 .editsection { font-weight: normal; } h6 { font-size: 80%; } - -/* To replicate the old padding, where h# were block-level elements and edit - * links were floated, we need to multiply .5em top padding and .17em bottom - * padding by the header text sizes. */ -.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */ -.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */ -.mw-h3 { padding: .66em 0 .22em; } /* etc. */ -.mw-h4 { padding: .58em 0 .20em; } -.mw-h5 { padding: .50em 0 .17em; } -.mw-h6 { padding: .40em 0 .14em; } +h6 .editsection { font-size: 125%; font-weight: normal; } ul { line-height: 1.5em; diff --git a/skins/simple/main.css b/skins/simple/main.css index 2929b9335a..d53443d2dd 100644 --- a/skins/simple/main.css +++ b/skins/simple/main.css @@ -1,3 +1,26 @@ +/* For clarity, explicitly state some recommendations from to make sure the editsection links scale right */ + +h1 { font-size: 2em; } +h2 { font-size: 1.5em; } +h3 { font-size: 1.17em; } +h5 { font-size: .83em; } +h6 { font-size: .75em; } +h1, h2, h3, h4, h5, h6 { font-weight: bolder } + +/* Now the custom parts */ + +/* Make edit sections (which are inside h# tags) normal-sized */ +.editsection { + font-weight: normal; +} +h1 .editsection { font-size: 50% } +h2 .editsection { font-size: 66.7% } +h3 .editsection { font-size: 85.5% } +h5 .editsection { font-size: 120% } +h6 .editsection { font-size: 133% } + + #toolbar { display: none; } @@ -63,22 +86,11 @@ p { } p img { margin: 0; } -.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { - margin: 0; -} -/* To replicate the old padding, where h# were block-level elements and edit - * links were floated, we need to multiply .5em top padding and .17em bottom - * padding by the header text sizes. We assume the W3 recommendations are - * used: 200%, 150%, 117%, 100%, 83%, 75% size in that order - * . If not the padding may be margin- - * ally off. */ -.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */ -.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */ -.mw-h3 { padding: .66em 0 .22em; } /* etc. */ -.mw-h4 { padding: .58em 0 .20em; } -.mw-h5 { padding: .50em 0 .17em; } -.mw-h6 { padding: .40em 0 .14em; } - +h1, h2, h3, h4, h5, h6 { + margin: 0; + padding-top: 0.5em; + padding-bottom: 0.17em; +} fieldset { margin: 1em 0em 1em 0em; padding: 0em 1em 1em 1em; -- 2.20.1