[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Separate styles for Special:UploadAvatar into a separate Res...

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

Change subject: Separate styles for Special:UploadAvatar into a separate 
ResourceLoader module
..


Separate styles for Special:UploadAvatar into a separate ResourceLoader module

Change-Id: Ifa80f2421bd07b26ef6f675508f331f985dd7c45
---
A UserProfile/SpecialUploadAvatar.css
M UserProfile/SpecialUploadAvatar.php
M UserProfile/UserProfile.css
M UserProfile/UserProfile.php
4 files changed, 35 insertions(+), 27 deletions(-)

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



diff --git a/UserProfile/SpecialUploadAvatar.css 
b/UserProfile/SpecialUploadAvatar.css
new file mode 100644
index 000..e65be57
--- /dev/null
+++ b/UserProfile/SpecialUploadAvatar.css
@@ -0,0 +1,24 @@
+#wpUploadSource {
+   width: 100px;
+}
+
+table.avatar-success-page {
+   border-collapse: collapse;
+   margin-top: 20px;
+   padding: 0;
+}
+
+table.avatar-success-page td.title-cell {
+   color: #797979;
+   font-size: 12px;
+   font-weight: 700;
+   padding: 5px 5px 20px 5px;
+}
+
+table.avatar-success-page td.image-cell {
+   padding-bottom: 20px;
+}
+
+table.avatar-success-page td.image-cell img {
+   border: 0;
+}
\ No newline at end of file
diff --git a/UserProfile/SpecialUploadAvatar.php 
b/UserProfile/SpecialUploadAvatar.php
index 01c83df..cefd354 100644
--- a/UserProfile/SpecialUploadAvatar.php
+++ b/UserProfile/SpecialUploadAvatar.php
@@ -46,7 +46,10 @@
$out = $this->getOutput();
 
// Add CSS
-   $out->addModuleStyles( 'ext.socialprofile.userprofile.css' );
+   $out->addModuleStyles( [
+   'ext.socialprofile.userprofile.css',
+   'ext.socialprofile.special.uploadavatar.css'
+   ] );
 
// Let the parent class do most of the heavy lifting.
parent::execute( $params );
diff --git a/UserProfile/UserProfile.css b/UserProfile/UserProfile.css
index 7f7e727..97f333e 100644
--- a/UserProfile/UserProfile.css
+++ b/UserProfile/UserProfile.css
@@ -494,32 +494,6 @@
text-decoration: none;
 }
 
-/* Avatar upload page (Special:UploadAvatar) */
-#wpUploadSource {
-   width: 100px;
-}
-
-table.avatar-success-page {
-   border-collapse: collapse;
-   margin-top: 20px;
-   padding: 0;
-}
-
-table.avatar-success-page td.title-cell {
-   color: #797979;
-   font-size: 12px;
-   font-weight: 700;
-   padding: 5px 5px 20px 5px;
-}
-
-table.avatar-success-page td.image-cell {
-   padding-bottom: 20px;
-}
-
-table.avatar-success-page td.image-cell img {
-   border: 0;
-}
-
 /* Update Profile */
 .profile-info {
padding: 25px 0;
diff --git a/UserProfile/UserProfile.php b/UserProfile/UserProfile.php
index 1420d1e..6e6eb48 100644
--- a/UserProfile/UserProfile.php
+++ b/UserProfile/UserProfile.php
@@ -103,6 +103,13 @@
'position' => 'top'
 );
 
+$wgResourceModules['ext.socialprofile.special.uploadavatar.css'] = array(
+   'styles' => 'SpecialUploadAvatar.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SocialProfile/UserProfile',
+   'position' => 'top'
+);
+
 # Add new log types for profile edits and avatar uploads
 global $wgLogTypes, $wgLogNames, $wgLogHeaders, $wgLogActions;
 $wgLogTypes[]= 'profile';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa80f2421bd07b26ef6f675508f331f985dd7c45
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: SamanthaNguyen 
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...SocialProfile[master]: Separate styles for Special:UploadAvatar into a separate Res...

2017-12-29 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/400996 )

Change subject: Separate styles for Special:UploadAvatar into a separate 
ResourceLoader module
..

Separate styles for Special:UploadAvatar into a separate ResourceLoader module

Change-Id: Ifa80f2421bd07b26ef6f675508f331f985dd7c45
---
A UserProfile/SpecialUploadAvatar.css
M UserProfile/SpecialUploadAvatar.php
M UserProfile/UserProfile.css
M UserProfile/UserProfile.php
4 files changed, 36 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/96/400996/1

diff --git a/UserProfile/SpecialUploadAvatar.css 
b/UserProfile/SpecialUploadAvatar.css
new file mode 100644
index 000..d6fe9e5
--- /dev/null
+++ b/UserProfile/SpecialUploadAvatar.css
@@ -0,0 +1,25 @@
+/* Avatar upload page (Special:UploadAvatar) */
+#wpUploadSource {
+   width: 100px;
+}
+
+table.avatar-success-page {
+   border-collapse: collapse;
+   margin-top: 20px;
+   padding: 0;
+}
+
+table.avatar-success-page td.title-cell {
+   color: #797979;
+   font-size: 12px;
+   font-weight: 700;
+   padding: 5px 5px 20px 5px;
+}
+
+table.avatar-success-page td.image-cell {
+   padding-bottom: 20px;
+}
+
+table.avatar-success-page td.image-cell img {
+   border: 0;
+}
\ No newline at end of file
diff --git a/UserProfile/SpecialUploadAvatar.php 
b/UserProfile/SpecialUploadAvatar.php
index 01c83df..cefd354 100644
--- a/UserProfile/SpecialUploadAvatar.php
+++ b/UserProfile/SpecialUploadAvatar.php
@@ -46,7 +46,10 @@
$out = $this->getOutput();
 
// Add CSS
-   $out->addModuleStyles( 'ext.socialprofile.userprofile.css' );
+   $out->addModuleStyles( [
+   'ext.socialprofile.userprofile.css',
+   'ext.socialprofile.special.uploadavatar.css'
+   ] );
 
// Let the parent class do most of the heavy lifting.
parent::execute( $params );
diff --git a/UserProfile/UserProfile.css b/UserProfile/UserProfile.css
index 7f7e727..97f333e 100644
--- a/UserProfile/UserProfile.css
+++ b/UserProfile/UserProfile.css
@@ -494,32 +494,6 @@
text-decoration: none;
 }
 
-/* Avatar upload page (Special:UploadAvatar) */
-#wpUploadSource {
-   width: 100px;
-}
-
-table.avatar-success-page {
-   border-collapse: collapse;
-   margin-top: 20px;
-   padding: 0;
-}
-
-table.avatar-success-page td.title-cell {
-   color: #797979;
-   font-size: 12px;
-   font-weight: 700;
-   padding: 5px 5px 20px 5px;
-}
-
-table.avatar-success-page td.image-cell {
-   padding-bottom: 20px;
-}
-
-table.avatar-success-page td.image-cell img {
-   border: 0;
-}
-
 /* Update Profile */
 .profile-info {
padding: 25px 0;
diff --git a/UserProfile/UserProfile.php b/UserProfile/UserProfile.php
index 1420d1e..6e6eb48 100644
--- a/UserProfile/UserProfile.php
+++ b/UserProfile/UserProfile.php
@@ -103,6 +103,13 @@
'position' => 'top'
 );
 
+$wgResourceModules['ext.socialprofile.special.uploadavatar.css'] = array(
+   'styles' => 'SpecialUploadAvatar.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SocialProfile/UserProfile',
+   'position' => 'top'
+);
+
 # Add new log types for profile edits and avatar uploads
 global $wgLogTypes, $wgLogNames, $wgLogHeaders, $wgLogActions;
 $wgLogTypes[]= 'profile';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa80f2421bd07b26ef6f675508f331f985dd7c45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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