[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Revert "Add class `mwe-math-element` to math elements"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329047 ) Change subject: Revert "Add class `mwe-math-element` to math elements" .. Revert "Add class `mwe-math-element` to math elements" This reverts commit e674d7e73bf6816f4dcbee5bee35f09cb53b88e9. That commit does not help to solve T134281. It adds a CSS class name which is configurable by a global variable to various math elements, which is confusing. Change-Id: Iea5f231e0cea1221dc717b3409b36c0baf11bb24 --- M MathMathML.php M MathSource.php M MathTexvc.php M extension.json M modules/ext.math.css 5 files changed, 2 insertions(+), 12 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/MathMathML.php b/MathMathML.php index 681b90b..40bc77c 100644 --- a/MathMathML.php +++ b/MathMathML.php @@ -418,7 +418,6 @@ * @return string the class name */ private function getClassName( $fallback = false ) { - global $wgMathElementClassName; $class = 'mwe-math-'; if ( $fallback ) { $class .= 'fallback-image-'; @@ -435,7 +434,7 @@ $class .= ' mwe-math-mathml-a11y'; // @codingStandardsIgnoreEnd } - return $class . " $wgMathElementClassName"; + return $class; } /** diff --git a/MathSource.php b/MathSource.php index 792e755..93d403d 100644 --- a/MathSource.php +++ b/MathSource.php @@ -35,13 +35,11 @@ function getHtmlOutput() { # No need to render or parse anything more! # New lines are replaced with spaces, which avoids confusing our parser (bugs 23190, 22818) - global $wgMathElementClassName; if ( $this->getMathStyle() == 'display' ) { $class = 'mwe-math-fallback-source-display'; } else { $class = 'mwe-math-fallback-source-inline'; } - $class .= " $wgMathElementClassName"; return Xml::element( 'span', $this->getAttributes( 'span', diff --git a/MathTexvc.php b/MathTexvc.php index aa64ea0..6c61d86 100644 --- a/MathTexvc.php +++ b/MathTexvc.php @@ -137,7 +137,6 @@ * @return string img HTML */ public function getMathImageHTML() { - global $wgMathElementClassName; $url = $this->getMathImageUrl(); $attributes = [ // the former class name was 'tex' @@ -149,7 +148,6 @@ // if DisplayStyle is true, the equation will be centered in a new line $attributes[ 'class' ] = 'mwe-math-fallback-image-display tex'; } - $attributes[ 'class' ] .= " $wgMathElementClassName"; return Xml::element( 'img', $this->getAttributes( 'img', diff --git a/extension.json b/extension.json index c9ce093..a059655 100644 --- a/extension.json +++ b/extension.json @@ -115,8 +115,7 @@ ], "MathEnableWikibaseDataType": true, "Texvc": false, - "TexvcBackgroundColor": "transparent", - "MathElementClassName": "mw-math-element" + "TexvcBackgroundColor": "transparent" }, "VisualEditorPluginModules": [ "ext.math.visualEditor" diff --git a/modules/ext.math.css b/modules/ext.math.css index 9892ce2..69ea129 100644 --- a/modules/ext.math.css +++ b/modules/ext.math.css @@ -57,7 +57,3 @@ img.tex { vertical-align: middle; } -.mwe-math-element { - overflow-x: auto; - max-width: 100%; -} -- To view, visit https://gerrit.wikimedia.org/r/329047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea5f231e0cea1221dc717b3409b36c0baf11bb24 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: PhysikerweltGerrit-Reviewer: Bmansurov Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Physikerwelt Gerrit-Reviewer: TameeshB Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Revert "Add class `mwe-math-element` to math elements"
Hello TameeshB, jenkins-bot, Bmansurov, TheDJ, Jdlrobson, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/329047 to review the following change. Change subject: Revert "Add class `mwe-math-element` to math elements" .. Revert "Add class `mwe-math-element` to math elements" This reverts commit e674d7e73bf6816f4dcbee5bee35f09cb53b88e9. Change-Id: Iea5f231e0cea1221dc717b3409b36c0baf11bb24 --- M MathMathML.php M MathSource.php M MathTexvc.php M extension.json M modules/ext.math.css 5 files changed, 2 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/47/329047/1 diff --git a/MathMathML.php b/MathMathML.php index 681b90b..40bc77c 100644 --- a/MathMathML.php +++ b/MathMathML.php @@ -418,7 +418,6 @@ * @return string the class name */ private function getClassName( $fallback = false ) { - global $wgMathElementClassName; $class = 'mwe-math-'; if ( $fallback ) { $class .= 'fallback-image-'; @@ -435,7 +434,7 @@ $class .= ' mwe-math-mathml-a11y'; // @codingStandardsIgnoreEnd } - return $class . " $wgMathElementClassName"; + return $class; } /** diff --git a/MathSource.php b/MathSource.php index 792e755..93d403d 100644 --- a/MathSource.php +++ b/MathSource.php @@ -35,13 +35,11 @@ function getHtmlOutput() { # No need to render or parse anything more! # New lines are replaced with spaces, which avoids confusing our parser (bugs 23190, 22818) - global $wgMathElementClassName; if ( $this->getMathStyle() == 'display' ) { $class = 'mwe-math-fallback-source-display'; } else { $class = 'mwe-math-fallback-source-inline'; } - $class .= " $wgMathElementClassName"; return Xml::element( 'span', $this->getAttributes( 'span', diff --git a/MathTexvc.php b/MathTexvc.php index aa64ea0..6c61d86 100644 --- a/MathTexvc.php +++ b/MathTexvc.php @@ -137,7 +137,6 @@ * @return string img HTML */ public function getMathImageHTML() { - global $wgMathElementClassName; $url = $this->getMathImageUrl(); $attributes = [ // the former class name was 'tex' @@ -149,7 +148,6 @@ // if DisplayStyle is true, the equation will be centered in a new line $attributes[ 'class' ] = 'mwe-math-fallback-image-display tex'; } - $attributes[ 'class' ] .= " $wgMathElementClassName"; return Xml::element( 'img', $this->getAttributes( 'img', diff --git a/extension.json b/extension.json index c9ce093..a059655 100644 --- a/extension.json +++ b/extension.json @@ -115,8 +115,7 @@ ], "MathEnableWikibaseDataType": true, "Texvc": false, - "TexvcBackgroundColor": "transparent", - "MathElementClassName": "mw-math-element" + "TexvcBackgroundColor": "transparent" }, "VisualEditorPluginModules": [ "ext.math.visualEditor" diff --git a/modules/ext.math.css b/modules/ext.math.css index 9892ce2..69ea129 100644 --- a/modules/ext.math.css +++ b/modules/ext.math.css @@ -57,7 +57,3 @@ img.tex { vertical-align: middle; } -.mwe-math-element { - overflow-x: auto; - max-width: 100%; -} -- To view, visit https://gerrit.wikimedia.org/r/329047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea5f231e0cea1221dc717b3409b36c0baf11bb24 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: PhysikerweltGerrit-Reviewer: Bmansurov Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: TameeshB Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits