Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/68725
Change subject: Separate page-actions from #content ...................................................................... Separate page-actions from #content Wikipedia admins should be able to style content safely without interfering with the ui (see https://en.m.wikipedia.org/w/index.php?title=MediaWiki_talk:Common.css&oldid=559614143) Change-Id: I87883d223e4ee99d4d457857a0ccbbeb426f0f42 --- M MobileFrontend.php A includes/skins/MobileTemplateBeta.php M includes/skins/SkinMobileBase.php M less/common/mf-buttons.less M less/common/pageactions.less M stylesheets/common/pageactions.css M stylesheets/common/ui.css 7 files changed, 39 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/25/68725/1 diff --git a/MobileFrontend.php b/MobileFrontend.php index ab14665..cdb14a2 100644 --- a/MobileFrontend.php +++ b/MobileFrontend.php @@ -66,6 +66,7 @@ 'MinervaTemplate' => 'skins/MinervaTemplate', 'MobileTemplate' => 'skins/MobileTemplate', + 'MobileTemplateBeta' => 'skins/MobileTemplateBeta', 'MobileTemplateWML' => 'skins/MobileTemplateWML', 'SkinMinerva' => 'skins/SkinMinerva', 'SkinMobile' => 'skins/SkinMobile', diff --git a/includes/skins/MobileTemplateBeta.php b/includes/skins/MobileTemplateBeta.php new file mode 100644 index 0000000..badc89d --- /dev/null +++ b/includes/skins/MobileTemplateBeta.php @@ -0,0 +1,23 @@ +<?php +class MobileTemplateBeta extends MobileTemplate { + public function renderContentWrapper( $data ) { + $isSpecialPage = $this->getSkin()->getTitle()->isSpecialPage(); + ?> + <div class='show' id='content_wrapper'> + <?php + if ( !$isSpecialPage ) { + echo $data['prebodytext']; + $this->renderPageActions( $data ); + } + ?> + <div id="content" class="content"> + <?php + echo $data[ 'bodytext' ]; + $this->renderLanguages( $data ); + echo $data['postbodytext']; + ?> + </div><!-- close #content --> + </div><!-- close #content_wrapper --> + <?php + } +} diff --git a/includes/skins/SkinMobileBase.php b/includes/skins/SkinMobileBase.php index 658eb28..1b0cff4 100644 --- a/includes/skins/SkinMobileBase.php +++ b/includes/skins/SkinMobileBase.php @@ -167,6 +167,9 @@ $this->setContext( $extMobileFrontend ); $this->extMobileFrontend = $extMobileFrontend; $ctx = MobileContext::singleton(); + if ( $ctx->isBetaGroupMember() ) { + $this->template = 'MobileTemplateBeta'; + } $this->addPageClass( 'mobile' ); if ( $ctx->isAlphaGroupMember() ) { $this->addPageClass( 'alpha' ); diff --git a/less/common/mf-buttons.less b/less/common/mf-buttons.less index bb221a4..9bd089a 100644 --- a/less/common/mf-buttons.less +++ b/less/common/mf-buttons.less @@ -1,6 +1,12 @@ @import "../mf-mixins.less"; /* reuses https://github.com/wikimedia/agora */ +// reset +button { + border: none; + background-color: transparent; +} + .button, button, input[type=submit] { diff --git a/less/common/pageactions.less b/less/common/pageactions.less index fadf7ad..e538914 100644 --- a/less/common/pageactions.less +++ b/less/common/pageactions.less @@ -9,14 +9,12 @@ } #section_0 { - margin-bottom: 0; + margin: @headingMarginTop @contentMarginRight 0 @contentMarginLeft; padding-bottom: @headingMarginBottom; border-bottom: dotted 1px #CACACA; } #page-actions { - // FIXME: negative margin hacks - margin: 0 -@contentMarginRight @headingMarginBottom -@contentMarginRight; padding: 8px @contentMarginRight; // end hacks border-bottom: solid 1px #CACACA; diff --git a/stylesheets/common/pageactions.css b/stylesheets/common/pageactions.css index 70de99e..d4c5555 100644 --- a/stylesheets/common/pageactions.css +++ b/stylesheets/common/pageactions.css @@ -5,12 +5,11 @@ display: none; } #section_0 { - margin-bottom: 0; + margin: 14pt 23px 0 23px; padding-bottom: 9pt; border-bottom: dotted 1px #CACACA; } #page-actions { - margin: 0 -23px 9pt -23px; padding: 8px 23px; border-bottom: solid 1px #CACACA; height: 40px; diff --git a/stylesheets/common/ui.css b/stylesheets/common/ui.css index 18ef2c3..dbf9c01 100644 --- a/stylesheets/common/ui.css +++ b/stylesheets/common/ui.css @@ -1,4 +1,8 @@ /* reuses https://github.com/wikimedia/agora */ +button { + border: none; + background-color: transparent; +} .button, button, input[type=submit] { -- To view, visit https://gerrit.wikimedia.org/r/68725 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87883d223e4ee99d4d457857a0ccbbeb426f0f42 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
