[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Lead section edit icon should be visible when no-js editing ...

2017-04-19 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/347126 )

Change subject: Lead section edit icon should be visible when no-js editing is 
enabled
..


Lead section edit icon should be visible when no-js editing is enabled

Bug: T125174
Change-Id: I98a310af7d4eadb7a449983ed5a9c0d474b8f827
---
M includes/skins/SkinMinerva.php
M resources/skins.minerva.base.styles/pageactions.less
M resources/skins.minerva.base.styles/ui.less
3 files changed, 7 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index d3a87e0..c7b851a 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -220,7 +220,7 @@
$noJsEdit = $this->getMFConfig()->get( 
'MFAllowNonJavaScriptEditing' );
 
if ( $this->isAllowedPageAction( 'edit' ) ) {
-   $additionalClass = $noJsEdit?' nojs-edit':'';
+   $additionalClass = $noJsEdit ? ' nojs-edit': '';
$lang = wfGetLangObj( $lang );
$message = $this->msg( 'mobile-frontend-editor-edit' 
)->inLanguage( $lang )->text();
$html = Html::openElement( 'span' );
diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index 368f7a8..86d8735 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -5,12 +5,16 @@
 
 // hide menu items when not possible to use
 .client-nojs #ca-watch,
-.client-nojs #ca-edit,
 #ca-talk.selected {
// Important as this is not negotiable.
display: none !important;
 }
 
+.client-nojs #ca-edit {
+   // This is negotiable as non-JS editing might be enabled.
+   display: none;
+}
+
 #page-actions .nojs-edit {
display: inline-block;
 }
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index efaed2d..190f417 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -423,7 +423,7 @@
 }
 
 .content .nojs-edit {
-   display: inline-block;
+   display: inline-block !important;
visibility: visible;
float: right;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/347126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I98a310af7d4eadb7a449983ed5a9c0d474b8f827
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
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...MobileFrontend[master]: Lead section edit icon should be visible when no-js editing ...

2017-04-07 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/347126 )

Change subject: Lead section edit icon should be visible when no-js editing is 
enabled
..

Lead section edit icon should be visible when no-js editing is enabled

Bug: T125174
Change-Id: I98a310af7d4eadb7a449983ed5a9c0d474b8f827
---
M includes/skins/SkinMinerva.php
M resources/skins.minerva.base.styles/pageactions.less
M resources/skins.minerva.base.styles/ui.less
3 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/26/347126/1

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 627ebcc..3dfe18e 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -217,7 +217,7 @@
$noJsEdit = $this->getMFConfig()->get( 
'MFAllowNonJavaScriptEditing' );
 
if ( $this->isAllowedPageAction( 'edit' ) ) {
-   $additionalClass = $noJsEdit?' nojs-edit':'';
+   $additionalClass = $noJsEdit ? ' nojs-edit': '';
$lang = wfGetLangObj( $lang );
$message = $this->msg( 'mobile-frontend-editor-edit' 
)->inLanguage( $lang )->text();
$html = Html::openElement( 'span' );
diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index 368f7a8..86d8735 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -5,12 +5,16 @@
 
 // hide menu items when not possible to use
 .client-nojs #ca-watch,
-.client-nojs #ca-edit,
 #ca-talk.selected {
// Important as this is not negotiable.
display: none !important;
 }
 
+.client-nojs #ca-edit {
+   // This is negotiable as non-JS editing might be enabled.
+   display: none;
+}
+
 #page-actions .nojs-edit {
display: inline-block;
 }
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index efaed2d..190f417 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -423,7 +423,7 @@
 }
 
 .content .nojs-edit {
-   display: inline-block;
+   display: inline-block !important;
visibility: visible;
float: right;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/347126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98a310af7d4eadb7a449983ed5a9c0d474b8f827
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits