Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133188
Change subject: Make border-box the default
......................................................................
Make border-box the default
Make our development lives easier.
Change-Id: Ib86b383d72597ae307558bbf50f53c2b09d25956
---
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateBeta.php
M includes/skins/SkinMinerva.php
M includes/skins/UserLoginMobileTemplate.php
M includes/specials/SpecialMobileDiff.php
M includes/specials/SpecialUserProfile.php
M less/common/OverlayNew.less
M less/common/common.less
M less/common/reset.less
M less/minerva.less/minerva.mixins.less
M less/modules/editor/VisualEditorOverlay.less
M templates/OverlayNew.html
M templates/modules/editor/EditorOverlay.html
M templates/modules/editor/EditorOverlayBase.html
M templates/modules/search/SearchOverlay.html
M templates/overlays/talkSectionAdd.html
M templates/page.html
M templates/talkSection.html
M templates/uploads/PhotoUploadOverlay.html
M templates/uploads/PhotoUploadProgress.html
20 files changed, 33 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/88/133188/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 318c88e..d74a9cf 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -226,12 +226,12 @@
echo $data[ 'headelement' ];
?>
<div id="mw-mf-viewport">
- <div id="mw-mf-page-left" class="navigation-drawer
border-box">
+ <div id="mw-mf-page-left" class="navigation-drawer">
<?php
$this->renderMainMenu( $data );
?>
</div>
- <div id='mw-mf-page-center' class="border-box">
+ <div id="mw-mf-page-center">
<?php
foreach( $this->data['banners'] as
$banner ):
echo $banner;
diff --git a/includes/skins/MinervaTemplateBeta.php
b/includes/skins/MinervaTemplateBeta.php
index 59c7574..c0c6059 100644
--- a/includes/skins/MinervaTemplateBeta.php
+++ b/includes/skins/MinervaTemplateBeta.php
@@ -2,7 +2,7 @@
class MinervaTemplateBeta extends MinervaTemplate {
// FIXME: Remove variable when secondary page actions menu moves to
stable
protected $languageButtonClassName = 'mw-ui-button mw-ui-progressive
button
- languageSelector border-box icon icon-32px';
+ languageSelector icon icon-32px';
public function renderPageActions( $data ) {
if ( !$this->isMainPage ) {
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 2f10f35..c7fd09c 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -551,7 +551,7 @@
protected function prepareSearch( BaseTemplate $tpl ) {
$searchBox = array(
'id' => 'searchInput',
- 'class' => 'search border-box',
+ 'class' => 'search',
'autocomplete' => 'off',
// The placeholder gets fed to HTML::element later
which escapes all
// attribute values, so no need to escape the string
here.
diff --git a/includes/skins/UserLoginMobileTemplate.php
b/includes/skins/UserLoginMobileTemplate.php
index 4a3d0ce..49102b5 100644
--- a/includes/skins/UserLoginMobileTemplate.php
+++ b/includes/skins/UserLoginMobileTemplate.php
@@ -62,14 +62,14 @@
'class' => 'inputs-box',
) ) .
Html::input( 'wpName', $username, 'text',
- array( 'class' => 'loginText border-box',
+ array( 'class' => 'loginText',
'placeholder' => wfMessage(
'mobile-frontend-username-placeholder' )->text(),
'id' => 'wpName1',
'tabindex' => '1',
'size' => '20',
'required' ) ) .
Html::input( 'wpPassword', null, 'password',
- array( 'class' => 'loginPassword border-box',
+ array( 'class' => 'loginPassword',
'placeholder' => wfMessage(
'mobile-frontend-password-placeholder' )->text(),
'id' => 'wpPassword1',
'tabindex' => '2',
diff --git a/includes/specials/SpecialMobileDiff.php
b/includes/specials/SpecialMobileDiff.php
index 5f3558c..506f308 100644
--- a/includes/specials/SpecialMobileDiff.php
+++ b/includes/specials/SpecialMobileDiff.php
@@ -222,7 +222,7 @@
$output->addHtml(
Html::openElement( 'div', array( 'id' =>
'mw-mf-userinfo',
- 'class' => 'buttonBar position-fixed
border-box' ) )
+ 'class' => 'buttonBar position-fixed' ) )
);
$userId = $this->rev->getUser();
diff --git a/includes/specials/SpecialUserProfile.php
b/includes/specials/SpecialUserProfile.php
index d738340..b7f4af8 100644
--- a/includes/specials/SpecialUserProfile.php
+++ b/includes/specials/SpecialUserProfile.php
@@ -51,7 +51,7 @@
'href' => $title->getLocalUrl() )
) .
$page->getMediumThumbnailHtml() .
- Html::openElement( 'div', array( 'class' => 'caption
border-box' ) ) .
+ Html::openElement( 'div', array( 'class' => 'caption' )
) .
$this->msg(
'mobile-frontend-profile-last-upload-caption' )
->numParams( $daysAgo ) // $1
->params( $this->targetUser->getName() ) // $2
@@ -77,7 +77,7 @@
$html = Html::openElement( 'div', array( 'class' =>
'card' ) )
. Html::openElement( 'div', array( 'class' =>
'container' ) )
. MobilePage::getPlaceHolderThumbnailHtml(
'list-thumb-thanks' )
- . Html::openElement( 'div', array( 'class' =>
'caption border-box' ) )
+ . Html::openElement( 'div', array( 'class' =>
'caption' ) )
. $this->msg(
'mobile-frontend-profile-last-thank',
$user,
$this->targetUser
@@ -109,7 +109,7 @@
$html = Html::openElement( 'div', array( 'class' =>
'card' ) )
. Html::openElement( 'div', array( 'class' =>
'container image' ) )
. $thumbnail
- . Html::openElement( 'div', array( 'class' =>
'caption border-box' ) )
+ . Html::openElement( 'div', array( 'class' =>
'caption' ) )
. $this->msg(
'mobile-frontend-profile-last-edit',
$rev->getTitle(),
$daysAgo,
diff --git a/less/common/OverlayNew.less b/less/common/OverlayNew.less
index 04c6d91..9330241 100644
--- a/less/common/OverlayNew.less
+++ b/less/common/OverlayNew.less
@@ -28,8 +28,8 @@
//
// Markup:
// <div class="overlay-enabled">
-// <div class="overlay border-box visible">
-// <div class="overlay-header-container border-box visible">
+// <div class="overlay visible">
+// <div class="overlay-header-container visible">
// <div class="overlay-header">
// <ul class="v-border bottom-border">
// <li><button class="cancel icon">Close</button></li>
@@ -49,8 +49,8 @@
//
// Markup:
// <div class="overlay-enabled">
-// <div class="overlay border-box visible">
-// <div class="overlay-header-container border-box visible">
+// <div class="overlay visible">
+// <div class="overlay-header-container visible">
// <div class="overlay-header">
// <ul class="v-border bottom-border">
// <li><button class="cancel icon">Close</button></li>
@@ -73,8 +73,8 @@
//
// Markup:
// <div class="overlay-enabled">
-// <div class="overlay border-box visible">
-// <div class="overlay-header-container border-box visible">
+// <div class="overlay visible">
+// <div class="overlay-header-container visible">
// <div class="overlay-header">
// <ul class="v-border bottom-border">
// <li><button class="cancel icon">Close</button></li>
@@ -326,8 +326,8 @@
// All types of overlays (progressive and constructive) apply here.
//
// Markup:
-// <div class="overlay border-box overlay-bottom position-fixed visible">
-// <div class="overlay-header-container border-box visible">
+// <div class="overlay overlay-bottom position-fixed visible">
+// <div class="overlay-header-container visible">
// <div class="overlay-header">
// <ul class="v-border bottom-border">
// <li><button class="cancel icon">Close</button></li>
diff --git a/less/common/common.less b/less/common/common.less
index c0cbcfe..7e9c6bb 100644
--- a/less/common/common.less
+++ b/less/common/common.less
@@ -54,13 +54,6 @@
}
}
-#mw-mf-page-left,
-#mw-mf-page-center,
-// FIXME: Remove above when cache is clear
-.border-box {
- .box-sizing(border-box);
-}
-
#content_wrapper {
.error {
color: #C85353;
diff --git a/less/common/reset.less b/less/common/reset.less
index 7a1cb2b..e19be25 100644
--- a/less/common/reset.less
+++ b/less/common/reset.less
@@ -2,6 +2,7 @@
v2.0 | 20110126
License: none (public domain)
*/
+@import "minerva.mixins";
html, body, div, span,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -20,6 +21,7 @@
font-size: 100%;
font: inherit;
vertical-align: baseline;
+ .box-sizing(border-box);
}
button {
border: none;
diff --git a/less/minerva.less/minerva.mixins.less
b/less/minerva.less/minerva.mixins.less
index e601328..60a88dd 100644
--- a/less/minerva.less/minerva.mixins.less
+++ b/less/minerva.less/minerva.mixins.less
@@ -11,12 +11,6 @@
color: #404040;
}
-.box-sizing( @value ) {
- -moz-box-sizing: @value;
- -webkit-box-sizing: @value;
- box-sizing: @value;
-}
-
.background-size( @width: auto, @height: auto ) {
/* use -webkit prefix for older android browsers eg. nexus 1 */
-o-background-size: @width @height;
diff --git a/less/modules/editor/VisualEditorOverlay.less
b/less/modules/editor/VisualEditorOverlay.less
index d16085a..7259ced 100644
--- a/less/modules/editor/VisualEditorOverlay.less
+++ b/less/modules/editor/VisualEditorOverlay.less
@@ -113,7 +113,6 @@
.oo-ui-tool-link {
height: 100%;
padding: 0;
- .box-sizing( border-box );
// FIXME: Merge with icon and icon-32px classes
.oo-ui-iconedElement-icon {
diff --git a/templates/OverlayNew.html b/templates/OverlayNew.html
index 3d755b8..41c1655 100644
--- a/templates/OverlayNew.html
+++ b/templates/OverlayNew.html
@@ -1,4 +1,4 @@
-<div class="overlay-header-container border-box visible {{#fixedHeader}}
position-fixed{{/fixedHeader}}">
+<div class="overlay-header-container visible {{#fixedHeader}}
position-fixed{{/fixedHeader}}">
<div class="overlay-header">
<ul class="v-border bottom-border">
<li><button class="cancel
icon">{{closeMsg}}</button></li>
diff --git a/templates/modules/editor/EditorOverlay.html
b/templates/modules/editor/EditorOverlay.html
index ae5f4a3..62f8e22 100644
--- a/templates/modules/editor/EditorOverlay.html
+++ b/templates/modules/editor/EditorOverlay.html
@@ -1,2 +1,2 @@
-<textarea class="border-box wikitext-editor" cols="40" rows="10"
placeholder="{{placeholder}}"></textarea>
+<textarea class="wikitext-editor" cols="40" rows="10"
placeholder="{{placeholder}}"></textarea>
<div class="preview content"></div>
diff --git a/templates/modules/editor/EditorOverlayBase.html
b/templates/modules/editor/EditorOverlayBase.html
index 495f48b..bafa82c 100644
--- a/templates/modules/editor/EditorOverlayBase.html
+++ b/templates/modules/editor/EditorOverlayBase.html
@@ -1,4 +1,4 @@
-<div class="overlay-header-container border-box visible position-fixed">
+<div class="overlay-header-container visible position-fixed">
{{>header}}
<div class="overlay-header save-header hideable hidden">
<ul class="v-border bottom-border">
@@ -26,13 +26,13 @@
<div class="panels">
<div class="save-panel panel hideable hidden">
- <input class="summary border-box" placeholder="{{summaryMsg}}"
/>
+ <input class="summary" placeholder="{{summaryMsg}}" />
<p class="license">{{{licenseMsg}}}</p>
</div>
<div class="captcha-panel panel hideable hidden">
<div class="inputs-box">
<img src="">
- <input class="captcha-word border-box"
placeholder="{{captchaMsg}}" />
+ <input class="captcha-word"
placeholder="{{captchaMsg}}" />
</div>
</div>
</div>
diff --git a/templates/modules/search/SearchOverlay.html
b/templates/modules/search/SearchOverlay.html
index cb6a91f..4bc37dd 100644
--- a/templates/modules/search/SearchOverlay.html
+++ b/templates/modules/search/SearchOverlay.html
@@ -1,5 +1,5 @@
<div class="search-overlay-contents">
- <div class="overlay-header-container border-box visible position-fixed">
+ <div class="overlay-header-container visible position-fixed">
<div class="overlay-header">
<ul class="v-border bottom-border">
<li><button class="cancel
icon">{{closeMsg}}</button></li>
diff --git a/templates/overlays/talkSectionAdd.html
b/templates/overlays/talkSectionAdd.html
index ebc3860..dbaaad9 100644
--- a/templates/overlays/talkSectionAdd.html
+++ b/templates/overlays/talkSectionAdd.html
@@ -2,6 +2,6 @@
<p class="license">{{{licenseMsg}}}</p>
</div>
<div class="panel">
- <input type="text" class="border-box summary"
placeholder="{{topicTitlePlaceHolder}}">
+ <input type="text" class="summary"
placeholder="{{topicTitlePlaceHolder}}">
</div>
-<textarea class="border-box wikitext-editor" cols="40" rows="10"
placeholder="{{topicContentPlaceHolder}}"></textarea>
+<textarea class="wikitext-editor" cols="40" rows="10"
placeholder="{{topicContentPlaceHolder}}"></textarea>
diff --git a/templates/page.html b/templates/page.html
index 8415d3e..05d79dc 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -26,7 +26,7 @@
{{#hasLanguages}}
<div id="page-secondary-actions">
<a href="{{languageUrl}}"
- class="mw-ui-button mw-ui-progressive button
languageSelector border-box icon icon-32px icon-text">
+ class="mw-ui-button mw-ui-progressive button
languageSelector icon icon-32px icon-text">
{{languageLabel}}
</a>
</div>
@@ -35,7 +35,7 @@
{{^inBetaOrAlpha}}
{{#hasLanguages}}
<a href="{{languageUrl}}"
- class="mw-ui-button mw-ui-progressive button languageSelector
border-box icon icon-32px icon-text">
+ class="mw-ui-button mw-ui-progressive button languageSelector
icon icon-32px icon-text">
{{languageLabel}}
</a>
{{/hasLanguages}}
diff --git a/templates/talkSection.html b/templates/talkSection.html
index 6f1c5a3..98ecad3 100644
--- a/templates/talkSection.html
+++ b/templates/talkSection.html
@@ -6,7 +6,7 @@
<div class="comment">
<div class="list-header">{{reply}}</div>
<div class="comment-content">
- <textarea class="border-box wikitext-editor"></textarea>
+ <textarea class="wikitext-editor"></textarea>
<p class="license">
{{info}}
{{{licenseMsg}}}
diff --git a/templates/uploads/PhotoUploadOverlay.html
b/templates/uploads/PhotoUploadOverlay.html
index 1c4527c..768d305 100644
--- a/templates/uploads/PhotoUploadOverlay.html
+++ b/templates/uploads/PhotoUploadOverlay.html
@@ -1,6 +1,6 @@
<div class="content">
<div class="preview loading"></div>
<p>{{ownerStatement}} <a href="#/upload-tutorial" class="help
inline">{{help}}</a></p>
- <textarea name="description" placeholder="{{descriptionPlaceholder}}"
class="border-box"></textarea>
+ <textarea name="description"
placeholder="{{descriptionPlaceholder}}"></textarea>
<p class="license">{{{license}}}</p>
</div>
diff --git a/templates/uploads/PhotoUploadProgress.html
b/templates/uploads/PhotoUploadProgress.html
index a197041..a76bc44 100644
--- a/templates/uploads/PhotoUploadProgress.html
+++ b/templates/uploads/PhotoUploadProgress.html
@@ -1,4 +1,4 @@
-<div class="overlay-header-container border-box visible position-fixed">
+<div class="overlay-header-container visible position-fixed">
<div class="overlay-header progress-header hideable">
<ul class="v-border bottom-border">
<li><button class="cancel
icon">{{closeMsg}}</button></li>
--
To view, visit https://gerrit.wikimedia.org/r/133188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib86b383d72597ae307558bbf50f53c2b09d25956
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
