Kaldari has submitted this change and it was merged.
Change subject: Hygiene: Use mw-ui-icon in stable
......................................................................
Hygiene: Use mw-ui-icon in stable
* Make the bold switchover!
* Keep some css rules around where cached HTML might need those classes -
this only applies to hamburger icon and search when JS disabled
Bug: T95619
Bug: T91178
Bug: T52326
Change-Id: I5b46c433a08ca92d6e432a84ca78d8083595b785
---
M includes/MobileUI.php
M includes/Resources.php
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
M javascripts/Icon.js
M javascripts/init.js
M javascripts/modules/mainMenu/MainMenu.js
M less/Overlay.less
M less/drawer.less
M less/icons.less
M less/mainmenu.less
M less/modules/editor/editor.less
M less/modules/issues.less
M less/modules/references.less
M less/modules/toc/toc.less
M less/modules/toggle.less
M less/modules/uploads/PhotoUploaderButton.less
M less/pagelist.less
D less/specials/images/refresh.png
M less/specials/mobilediff.less
M less/specials/nearby.less
M less/specials/pagefeed.less
M less/specials/userprofile.less
M less/spinner.less
M less/tablet/common.less
M less/ui.less
26 files changed, 62 insertions(+), 483 deletions(-)
Approvals:
Jhernandez: Looks good to me, but someone else must approve
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileUI.php b/includes/MobileUI.php
index 9f07ebb..81e7f1d 100644
--- a/includes/MobileUI.php
+++ b/includes/MobileUI.php
@@ -19,16 +19,9 @@
* @return string class name for use with HTML element
*/
public static function iconClass( $iconName, $iconType = 'element',
$additionalClassNames = '' ) {
- $ctx = MobileContext::singleton();
- if ( $ctx->isBetaGroupMember() ) {
- $base = 'mw-ui-icon';
- $modifiers = 'mw-ui-icon-' . $iconType;
- $modifiers .= ' mw-ui-icon-' . $iconName;
- } else {
- $base = 'icon';
- $modifiers = $iconType === 'before' ? 'icon-text' : '';
- $modifiers .= ' icon-' . $iconName;
- }
+ $base = 'mw-ui-icon';
+ $modifiers = 'mw-ui-icon-' . $iconType;
+ $modifiers .= ' mw-ui-icon-' . $iconName;
return $base . ' ' . $modifiers . ' ' . $additionalClassNames;
}
diff --git a/includes/Resources.php b/includes/Resources.php
index bd224b5..83cb262 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -37,7 +37,9 @@
'less/pageactions.less',
'less/footer.less',
'less/common.less',
+ // FIXME: Remove and rename iconsNew when the cache has
cleared
'less/icons.less',
+ 'less/iconsNew.less',
'less/mainpage.less',
),
),
@@ -70,11 +72,6 @@
'styles' => array(
'less/tablet/common.less',
'less/tablet/hacks.less',
- ),
- ),
- 'skins.minerva.icons.styles' => $wgMFResourceFileModuleBoilerplate +
array(
- 'styles' => array(
- 'less/iconsNew.less',
),
),
'skins.minerva.icons.images' => $wgMFResourceFileModuleBoilerplate +
array(
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 705250e..303af28 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -988,6 +988,8 @@
'skins.minerva.content.styles',
'skins.minerva.drawers.styles',
'skins.minerva.tablet.styles',
+ 'mediawiki.ui.icon',
+ 'skins.minerva.icons.images',
// FIXME: This module should be loaded by any special
page that needs it, not here
'mobile.pagelist.styles',
);
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index 1e40856..8f30066 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -137,9 +137,6 @@
*/
protected function getSkinStyles() {
$styles = parent::getSkinStyles();
- $styles[] = 'mediawiki.ui.icon';
- $styles[] = 'skins.minerva.icons.styles';
- $styles[] = 'skins.minerva.icons.images';
$styles[] = 'skins.minerva.beta.styles';
$styles[] = 'skins.minerva.beta.images';
diff --git a/javascripts/Icon.js b/javascripts/Icon.js
index 1aa11eb..a0801df 100644
--- a/javascripts/Icon.js
+++ b/javascripts/Icon.js
@@ -1,8 +1,6 @@
( function ( M, $ ) {
var View = M.require( 'View' ),
- context = M.require( 'context' ),
- useMediaWikiUI = context.isBetaGroupMember(),
Icon;
/**
@@ -25,9 +23,9 @@
defaults: {
hasText: false,
tagName: 'div',
- base: useMediaWikiUI ? 'mw-ui-icon' : 'icon',
+ base: 'mw-ui-icon',
name: '',
- modifier: useMediaWikiUI ? 'mw-ui-icon-element' : '',
+ modifier: 'mw-ui-icon-element',
title: ''
},
/**
@@ -49,7 +47,7 @@
/** @inheritdoc */
initialize: function ( options ) {
if ( options.hasText ) {
- options.modifier = useMediaWikiUI ?
'mw-ui-icon-before' : 'icon-text';
+ options.modifier = 'mw-ui-icon-before';
}
View.prototype.initialize.call( this, options );
},
diff --git a/javascripts/init.js b/javascripts/init.js
index 2e7c3ff..a8e9624 100644
--- a/javascripts/init.js
+++ b/javascripts/init.js
@@ -7,6 +7,7 @@
*/
( function ( M, $ ) {
var currentPage, skin,
+ $cachedIcons = $( '#page-actions' ).find( '.icon' ),
PageApi = M.require( 'PageApi' ),
pageApi = new PageApi(),
Page = M.require( 'Page' ),
@@ -77,4 +78,12 @@
mw.config.get( 'wgMFEnableJSConsoleRecruitment' ) ) {
console.log( mw.msg( 'mobile-frontend-console-recruit' ) );
}
+
+ // FIXME: Remove when old icon classes are no longer in page html.
+ if ( $cachedIcons.length ) {
+ // load the missing modules...
+ mw.loader.load( [ 'mediawiki.ui.icon',
'skins.minerva.icons.images' ] );
+ $cachedIcons.addClass( 'mw-ui-icon mw-ui-icon-element'
).removeClass( 'icon' );
+ $cachedIcons.filter( '.icon-text' ).addClass(
'mw-ui-icon-before' ).removeClass( 'icon-text mw-ui-icon-element' );
+ }
}( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/modules/mainMenu/MainMenu.js
b/javascripts/modules/mainMenu/MainMenu.js
index 622274e..e64d644 100644
--- a/javascripts/modules/mainMenu/MainMenu.js
+++ b/javascripts/modules/mainMenu/MainMenu.js
@@ -53,6 +53,18 @@
}
ev.preventDefault();
} );
+
+ // FIXME: Remove all of the below when cache cleared
and mw-ui-icon used everywhere.
+ this.$( '.icon-text' ).addClass( 'mw-ui-icon-before'
).removeClass( 'icon-text mw-ui-icon-before' );
+ this.$( '.icon' ).addClass( 'mw-ui-icon
mw-ui-icon-before' ).removeClass( 'icon' )
+ .each( function () {
+ // replace the glyph
+ var $link = $( this ),
+ classes = ( $link.attr( 'class'
) || '' ).split( /\s+/ );
+ $link.attr( 'class', $.map( classes,
function ( c ) {
+ return c.replace(
/^icon-(.*)$/, 'mw-ui-icon-$1' );
+ } ).join( ' ' ) );
+ } );
},
/**
diff --git a/less/Overlay.less b/less/Overlay.less
index c9bb8f9..c93d46f 100644
--- a/less/Overlay.less
+++ b/less/Overlay.less
@@ -160,20 +160,10 @@
&.prev {
left: 0;
- // FIXME: Remove when mw-ui-icon in stable
- .icon {
-
.background-image('../images/uploads/chevronLeft.png');
- right: 0;
- }
}
&.next {
right: 1em;
- // FIXME: Remove when mw-ui-icon in stable
- .icon {
-
.background-image('../images/uploads/chevronRight.png');
- right: @buttonWidth - 32px;
- }
}
// vertically align icon.
diff --git a/less/drawer.less b/less/drawer.less
index 3df89b3..67f06ed 100644
--- a/less/drawer.less
+++ b/less/drawer.less
@@ -46,12 +46,6 @@
.cancel {
display: block;
margin: auto;
-
- // FIXME: Remove when mw-ui-icon in stable
- &.icon {
- height: 32px;
- background-position: 50% 8px;
- }
}
}
diff --git a/less/icons.less b/less/icons.less
index 20d158f..e31fb8b 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -1,4 +1,9 @@
-// FIXME: Standardise on all our icon sizes
+/**
+ * FIXME: Remove this entire file when cache has cleared (this is needed for
non-js users)
+ * Note that with JS disabled only hamburger and search icon are visible in
stable on an article page.
+ * JS fixes the other issues with the icon class being used in page html.
+ * Remember HTML for special pages is not cached.
+ */
@import "minerva.variables";
@import "minerva.mixins";
@import "mediawiki.mixins";
@@ -7,24 +12,7 @@
min-height: @size;
min-width: @size;
}
-// Icons
-//
-// Styleguide 8.
-
-// Icon
-//
-// Use the icon class whenever you are using an icon - whether it be in
-// a button, link or other input field. All icons should be 24px width and
-// centered by default and will hide any text in the element.
-//
-// Markup:
-// <div class="icon icon-edit">edit</div>
-//
-// Styleguide 8.1.
-.mw-ui-button.mw-ui-progressive.icon,
-.profile .icon-talk-blue,
-// FIXME: Kill above when mediawiki ui buttons does not use background
declaration
.icon {
background-repeat: no-repeat;
.background-size( 24px, auto );
@@ -39,198 +27,11 @@
}
}
-// Icon (text)
-//
-// When used in conjunction with the icon class, this will
-// show any text within the icon element. Note currently the caller
-// must also specify left padding to avoid overlay with the text.
-//
-// Markup:
-// <div class="icon icon-text icon-edit" style="padding-left: 30px;">edit</div>
-//
-// Styleguide 8.2.
-.stable #page-secondary-actions .mw-ui-button.mw-ui-progressive.icon,
-// FIXME: Kill above rule when mediawiki ui stops using background property
and cache is clear
-.profile .icon-talk-blue,
-.mw-ui-button.mw-ui-progressive.icon.icon-text,
-// FIXME: Kill above 2 rules when mediawiki ui buttons stops using background
property
-.icon-text {
- text-indent: 0;
- background-position: left center;
-}
-
-// FIXME: Replace all instances of icon-12px with icon-16px
-.icon-12px {
- .background-size( auto, 12px );
- .default-icon-size( 12px );
-}
-
-// FIXME: Replace all instances of icon-15px with icon-16px
-.icon-15px {
- .background-size( 15px, auto );
-}
-
-// Icon (16px)
-//
-// When used in conjunction with the icon class, this will
-// shrink the icon to 16px
-//
-// Markup:
-// <div class="icon icon-16px icon-edit">edit</div>
-//
-// Styleguide 8.1.1
-.icon.icon-16px {
- .default-icon-size( 16px );
- .background-size( 16px, auto );
-}
-
-// FIXME: Replace all instances of icon-18px with icon-16px
-.icon.icon-18px {
- .background-size( 18px, 18px );
-}
-
-// FIXME: Replace all instances of these icons with icon-16px or icon-24px
-.icon.icon-20px {
- .background-size( auto, 20px );
-}
-
-
-// Icon (32px)
-//
-// When used in conjunction with the icon class, this will
-// increase the icon size to 32px
-//
-// Markup:
-// <div class="icon icon-32px icon-edit"
style="width:32px;height:32px;">edit</div>
-//
-// Styleguide 8.1.2.
-.icon.mw-ui-button.mw-ui-progressive.icon-32px,
-// FIXME: Kill above when mediawiki ui buttons does not use background
declaration
-.icon.icon-32px {
- .background-size( 32px, auto );
- .default-icon-size( 32px );
-}
-
-
-// Icon (edit)
-//
-// Renders a locked edit icon
-//
-// Markup:
-// <div class="icon icon-edit">edit</div>
-//
-// Styleguide 8.3.1.
-.icon-edit {
- .background-image('images/pagemenu/edit-locked.png');
-}
-
-// Icon (enabled edit)
-//
-// Renders an enabled edit icon
-//
-// Markup:
-// <div class="icon icon-edit-enabled">edit</div>
-//
-// Styleguide 8.3.2.
-.icon-edit-enabled {
- .background-image('images/pagemenu/edit.png');
-}
-
-// Icon (talk)
-//
-// Renders a talk icon
-//
-// Markup:
-// <div class="icon icon-talk">talk</div>
-//
-// Styleguide 8.3.3.
-.icon-talk {
- .background-image('images/pagemenu/talk.png');
-}
-
-// Icon (watch)
-//
-// Renders a watch icon where the page is not watched.
-//
-// Markup:
-// <div class="icon watch-this-article">watch</div>
-//
-// Styleguide 8.3.4.
-// FIXME: Remove when mw-ui-icon in stable
-.icon.watch-this-article {
- .background-image('images/watch.png');
-
- // Icon (watched)
- //
- // Renders a watch icon where the page is watched.
- //
- // Markup:
- // <div class="icon watch-this-article watched">watch</div>
- //
- // Styleguide 8.3.4.
- &.icon-watched {
- .background-image('images/watched.png');
- }
-}
-
-// Icon (search)
-//
-// Renders a search icon.
-//
-// Markup:
-// <div class="icon icon-search">search</div>
-//
-// Styleguide 8.3.5.
.icon-search {
- // FIXME: This 2 rules should probably be part of .icon
width: 24px;
height: 24px;
background-color: #FFF;
.background-image-svg-quick('images/magnifying-glass');
-}
-
-// Icon (cancel)
-//
-// Renders a cancel icon to escape a Drawer or Overlay
-//
-// Markup:
-// <div class="icon icon-cancel">cancel</div>
-//
-// Styleguide 8.3.6.
-.icon-cancel {
- .background-image('images/cancel.png');
-}
-
-.icon-cancel-light {
- .background-image-svg( 'images/cancel-light.svg',
'images/cancel-light.png' );
-}
-
-.icon-photo {
- .background-image('images/camera.png') !important;
-}
-
-.icon-clear {
- .background-image('images/clear.png');
-}
-
-.icon-back {
- .background-image('images/back-ltr.png');
-}
-
-.icon-arrow-down {
- .background-image('images/show.png');
-}
-
-.icon-arrow-up {
- .background-image('images/hide.png');
-}
-
-.icon-citation {
- .background-image-svg-quick( 'images/cite' );
-}
-
-.icon-spinner {
- .background-image('images/ajax-loader.gif')
}
.icon-mainmenu {
diff --git a/less/mainmenu.less b/less/mainmenu.less
index c5161b9..a4796ba 100644
--- a/less/mainmenu.less
+++ b/less/mainmenu.less
@@ -85,43 +85,6 @@
}
}
- .icon-home {
- .background-image('images/menu/home.png');
- }
-
- .icon-random {
- .background-image('images/menu/random.png');
- }
-
- .icon-watchlist {
- .background-image('images/menu/watchlist.png');
- }
-
- .icon-uploads {
- .background-image('images/menu/uploads.png');
- }
-
- .icon-nearby {
- .background-image('images/menu/nearby.png');
- }
-
- .icon-settings {
- .background-image('images/menu/settings.png');
- }
-
- .icon-secondary-logout {
- .background-image('images/menu/loginout.png');
- }
-
- .icon-profile {
- .background-image('images/menu/user.png');
- }
-
- // FIXME: Remove when mw-ui-icon in stable
- .icon.icon-anon {
- .background-image('images/menu/anon.png');
- }
-
li {
position: relative; // ensure the logout link in beta
can be position absolute
font-size: @menuItemFontSize;
@@ -141,23 +104,8 @@
a {
color: white;
display: block;
- padding: @menuLinkLineHeight / 2 10px
@menuLinkLineHeight / 2 0;
-
- &.mw-ui-icon {
- padding-left: 9px;
-
- &.mw-ui-icon-element {
- font-size: round(1 /
@menuItemFontSize, 1)
- }
- }
-
- // FIXME: Remove when cache cleared
- &.icon {
- // FIXME: Remove when mw-ui-icon in
stable
- background-position: 9px center;
- padding: @menuLinkLineHeight / 2 10px
@menuLinkLineHeight / 2 @menuLinkLineHeight * 2;
- line-height: @menuLinkLineHeight;
- }
+ padding: @menuLinkLineHeight / 2 10px
@menuLinkLineHeight / 2 9px;
+ font-size: round(1 / @menuItemFontSize, 1)
&:hover {
text-decoration: none;
diff --git a/less/modules/editor/editor.less b/less/modules/editor/editor.less
index f30abd1..9ae83bf 100644
--- a/less/modules/editor/editor.less
+++ b/less/modules/editor/editor.less
@@ -1,18 +1,6 @@
@import "minerva.variables";
@import "minerva.mixins";
-// no fallback mixin for those SVGs (VE doesn't work on browsers without SVG
-// support anyway)
-// FIXME: Remove when mw-ui-icon in stable
-.icon.icon-edit-source {
- .background-image( 'images/editSourceNormal.svg' );
-}
-
-// FIXME: Remove when mw-ui-icon in stable
-.icon.icon-edit-ve {
- .background-image( 'images/editVeNormal.svg' );
-}
-
.editor-overlay {
.preview {
display: none;
diff --git a/less/modules/issues.less b/less/modules/issues.less
index 172ee87..9e4b97d 100644
--- a/less/modules/issues.less
+++ b/less/modules/issues.less
@@ -21,25 +21,6 @@
}
}
-// FIXME: remove when mw-ui-icon in stable
-.stable {
- .mw-mf-cleanup {
- .background-image-svg-quick( 'images/issues/blue-triangle' );
- background-position: 10px center left;
- }
-
- .overlay {
- .cleanup {
- li {
- .issue-notice {
- .background-image-svg-quick(
'images/issues/gray-triangle' );
- background-position: center
@smallIconSize;
- }
- }
- }
- }
-}
-
// overlay styles
.overlay {
.cleanup {
@@ -67,12 +48,8 @@
.issue-notice {
padding: 2em 1em 2em (@largeIconSize +
10px);
margin: 0 1em 0 @headerHeight;
- // FIXME: Remove when mw-ui-icon in
stable
- &.icon {
- .background-size(
@largeIconSize, @largeIconSize );
- background-position: left
center;
- }
+ // FIXME: Please remove this. It should
not care about how icons are rendered.
&:before {
top: 0;
left: 0;
diff --git a/less/modules/references.less b/less/modules/references.less
index 309c7cc..92d5f31 100644
--- a/less/modules/references.less
+++ b/less/modules/references.less
@@ -20,12 +20,7 @@
display: none;
}
- // FIXME: Remove when mw-ui-icon in stable
- .icon {
- float: right;
- margin-top: .7em;
- }
-
+ // FIXME: Don't use mw-ui-icon class here.
.mw-ui-icon {
float: right;
line-height: normal;
diff --git a/less/modules/toc/toc.less b/less/modules/toc/toc.less
index 06e76d1..f8b2c39 100644
--- a/less/modules/toc/toc.less
+++ b/less/modules/toc/toc.less
@@ -7,18 +7,6 @@
@paddingVertical: 1.4em;
@fontSize: .8em;
-// FIXME: Remove when new icons used in stable
-.icon-toc {
- .background-image-svg-quick('images/contents-ltr');
-}
-
-.stable {
- .toc-mobile {
- .collapsible-heading {
- line-height: 1.4;
- }
- }
-}
.client-js .toc-mobile {
position: relative;
@@ -33,11 +21,7 @@
.toc-button {
float: left;
display: block;
-
- // promote to parent class when in stable
- &.mw-ui-icon {
- font-size: @fontSize;
- }
+ font-size: @fontSize;
}
.collapsible-heading {
@@ -47,10 +31,6 @@
font-weight: bold;
padding: @paddingVertical / 2 0;
border-bottom: none;
- &.icon {
- // add right padding to the chevron without reducing
tapable area
- border-right: @paddingHorizontal solid transparent;
- }
// Override rules for section toggler
// In table of contents the collapsing caret is on the right
@@ -85,20 +65,6 @@
white-space: pre-wrap;
}
line-height: 1.2;
- }
- }
- }
-}
-
-// FIXME: remove rule when mw-ui-icon in stable
-.client-js {
- .stable {
- .toc-mobile {
- .collapsible-heading {
- padding-left: .8em;
- .indicator {
- margin: 0 0 0 .5em;
- }
}
}
}
diff --git a/less/modules/toggle.less b/less/modules/toggle.less
index 2839c51..38b8e1d 100644
--- a/less/modules/toggle.less
+++ b/less/modules/toggle.less
@@ -19,20 +19,13 @@
.indicator {
float: left;
- // FIXME: We should either remove this or use a more
generic selector
- &.mw-ui-icon {
- margin-top: .7em;
- font-size: .4em;
- }
+ margin-top: .7em;
+ font-size: .4em;
}
}
.section-heading {
padding-right: @sectionIconWidth + 15px;
-
- .icon {
- margin-right: 12px;
- }
}
.section-heading {
diff --git a/less/modules/uploads/PhotoUploaderButton.less
b/less/modules/uploads/PhotoUploaderButton.less
index 9328940..8ee59a5 100644
--- a/less/modules/uploads/PhotoUploaderButton.less
+++ b/less/modules/uploads/PhotoUploaderButton.less
@@ -6,16 +6,6 @@
// Ensure entire button is clickable
.button {
position: relative;
- }
-
- // FIXME: Remove when mw-ui-icon in stable
- .icon-photo {
- background-position: left 10px center !important;
- padding-left: 44px;
- }
-
- // FIXME: Rename to generic .button when mw-ui-icon in stable
- .mw-ui-icon-photo {
display: table;
position: relative;
margin: 0 auto;
diff --git a/less/pagelist.less b/less/pagelist.less
index 4b6c91e..ac1271b 100644
--- a/less/pagelist.less
+++ b/less/pagelist.less
@@ -1,7 +1,8 @@
@import "minerva.variables";
@import "minerva.mixins";
-@itemPaddingV: 12px;
+@itemPaddingV: .8em;
+@titleMarginV: .5em;
@thumbGap: 15px;
@thumbWidth: 70px;
@thumbSpace: @thumbWidth + @thumbGap;
@@ -102,6 +103,15 @@
margin: -1px 0 0;
line-height: 1;
+ // FIXME: use more generic class here to apply to any icon in a
page list
+ .watch-this-article {
+ position: absolute;
+ right: 0;
+ top: @itemPaddingV;
+ // undo thumbnail damage
+ margin-top: 1px;
+ }
+
> a {
display: block;
color: @colorGray6;
@@ -135,7 +145,7 @@
.mw-mf-user,
.component,
.info {
- margin: .5em 0;
+ margin: @titleMarginV 0;
}
}
diff --git a/less/specials/images/refresh.png b/less/specials/images/refresh.png
deleted file mode 100644
index 9a0f1c4..0000000
--- a/less/specials/images/refresh.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/mobilediff.less b/less/specials/mobilediff.less
index 1de0333..e3b3fe0 100644
--- a/less/specials/mobilediff.less
+++ b/less/specials/mobilediff.less
@@ -13,26 +13,6 @@
#mw-mf-diffview {
@userInfoHeight: 5em;
- // FIXME: Remove when mw-ui-icon in stable
- .icon {
- padding-left: 18px;
-
- // FIXME: Remove when mw-ui-icon in stable
- &.mw-mf-bytesadded {
- .background-image('images/positive.png');
- }
-
- // FIXME: Remove when mw-ui-icon in stable
- &.mw-mf-bytesremoved {
- .background-image('images/negative.png');
- }
-
- // FIXME: Remove when mw-ui-icon in stable
- &.mw-mf-bytesneutral {
- .background-image('images/neutral.png');
- }
- }
-
.meta {
font-size: 0.7em;
text-transform: uppercase;
diff --git a/less/specials/nearby.less b/less/specials/nearby.less
index ea48af1..3c81e50 100644
--- a/less/specials/nearby.less
+++ b/less/specials/nearby.less
@@ -13,10 +13,6 @@
}
}
-.icon-refresh {
- .background-image('images/refresh.png');
-}
-
.client-js {
// note this also means non-ResourceLoader enabled browsers hence not
using tag
.noscript {
diff --git a/less/specials/pagefeed.less b/less/specials/pagefeed.less
index 26caf38..4926931 100644
--- a/less/specials/pagefeed.less
+++ b/less/specials/pagefeed.less
@@ -81,22 +81,10 @@
.mw-mf-user {
color: @grayMediumDark;
display: inline-block; // so that the icon in beta is next to the text
when the text is centered
-
- // FIXME: Remove when mw-ui-icon in stable
- &.icon {
- padding: 1px 0 0 20px;
- .background-image-svg-quick("images/userNormal");
- background-repeat: no-repeat;
- }
}
.mw-mf-anon {
color: inherit;
-
- // FIXME: Remove when mw-ui-icon in stable
- &.icon {
- .background-image-svg-quick("images/userAnonymous");
- }
}
a.more {
diff --git a/less/specials/userprofile.less b/less/specials/userprofile.less
index 0465ad7..7c89957 100644
--- a/less/specials/userprofile.less
+++ b/less/specials/userprofile.less
@@ -56,16 +56,9 @@
clear: both;
padding: 2em 0 0;
- .icon-talk,
- // FIXME: Remove above selector when mw-ui-icon in stable
- .mw-ui-icon {
+ // talk button
+ > a {
margin-top: 1.5em;
- }
-
- // FIXME: Remove when mw-ui-icon in stable
- .icon-talk {
- padding-left: 40px;
- background-position: left 10px center;
}
}
}
diff --git a/less/spinner.less b/less/spinner.less
index 6b0944d..2b1d2b7 100644
--- a/less/spinner.less
+++ b/less/spinner.less
@@ -17,23 +17,11 @@
.background-image('images/ajax-loader.gif') !important;
}
-// FIXME: This can be removed when mw-ui-icon in stable
-.beta .loading,
-.stable .loading {
-
+.loading {
&.spinner {
height: 54px;
text-align: center;
background-position: 50%;
margin: 8px auto;
- }
-}
-
-// FIXME: Remove alpha class when mw-ui-icon class in stable
-.alpha {
- .loading {
- &.spinner {
- margin: 8px auto;
- }
}
}
diff --git a/less/tablet/common.less b/less/tablet/common.less
index 2b4cb8f..1a02758 100644
--- a/less/tablet/common.less
+++ b/less/tablet/common.less
@@ -34,10 +34,6 @@
position: absolute;
right: 0;
top: 0;
- // FIXME: Remove when mw-ui-icon in stable
- li.icon {
- margin: 0 0 0 16px;
- }
}
// FIXME: Have a class that identifies all 4 of these
diff --git a/less/ui.less b/less/ui.less
index 8779022..ae6212b 100644
--- a/less/ui.less
+++ b/less/ui.less
@@ -158,20 +158,19 @@
.content {
// Correct icon sizes of edit icon when using mw-ui-icon.
h1 {
- // FIXME: Make less specific when mw-ui-icon default.
- .mw-ui-icon.edit-page {
+ .edit-page {
font-size: 1 / @fontSizeH1;
}
}
h2 {
- .mw-ui-icon.edit-page {
+ .edit-page {
font-size: 1 / @fontSizeH2;
}
}
h3 {
- .mw-ui-icon.edit-page {
+ .edit-page {
font-size: 1 / @fontSizeH3;
}
}
@@ -263,18 +262,6 @@
visibility: hidden;
}
- // FIXME: Remove when cache is cleared.
- &.icon {
- width: @headerHeight;
- text-align: right;
- .background-image-svg-quick( 'images/bell' );
- // Fixes positioning in Firefox
- display: inline-block;
- float: right;
- // FIXME: This shouldn't be needed
- height: @headerHeight;
- }
-
&.loading span {
display: none;
}
@@ -320,15 +307,6 @@
// For talk and CTA drawer
.mw-ui-block {
width: auto;
- }
-}
-
-// Move to a separate file if beta styling gets considerably large
-.beta {
- // FIXME: Remove when mw-ui-icon is in beta
- .mw-ui-button.icon-talk {
- background-position: left 10px center;
- padding-left: 50px;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/202089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b46c433a08ca92d6e432a84ca78d8083595b785
Gerrit-PatchSet: 26
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhernandez <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
