From d58d5cfcc22c6324556db62c35eb7d821ec7797b Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Mon, 29 Apr 2019 17:09:43 +0100 Subject: [PATCH] mw.widgets.TitleWidget: Update icons, use OOUI where possible Bug: T222079 Change-Id: I7ff1ca9410236b7404556cb0b90cab3340ee7b0b --- resources/Resources.php | 1 + .../images/page-disambiguation-ltr.svg | 4 ++-- .../images/page-disambiguation-rtl.svg | 4 ++-- .../mediawiki.widgets/images/page-existing-ltr.svg | 4 ---- .../mediawiki.widgets/images/page-existing-rtl.svg | 4 ---- .../images/page-not-found-he-yi.svg | 4 ++-- .../images/page-not-found-ltr.svg | 4 ++-- .../images/page-not-found-rtl.svg | 4 ++-- .../mediawiki.widgets/images/page-redirect-ltr.svg | 4 ---- .../mediawiki.widgets/images/page-redirect-rtl.svg | 4 ---- .../mw.widgets.TitleOptionWidget.js | 4 ++-- .../mediawiki.widgets/mw.widgets.TitleWidget.less | 14 +++----------- 12 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 resources/src/mediawiki.widgets/images/page-existing-ltr.svg delete mode 100644 resources/src/mediawiki.widgets/images/page-existing-rtl.svg delete mode 100644 resources/src/mediawiki.widgets/images/page-redirect-ltr.svg delete mode 100644 resources/src/mediawiki.widgets/images/page-redirect-rtl.svg diff --git a/resources/Resources.php b/resources/Resources.php index b9238324b6..469f78ee69 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -2514,6 +2514,7 @@ return [ 'oojs-ui-widgets', 'mediawiki.widgets.styles', // TitleInputWidget + 'oojs-ui.styles.icons-content', 'mediawiki.Title', 'mediawiki.api', 'mediawiki.String', diff --git a/resources/src/mediawiki.widgets/images/page-disambiguation-ltr.svg b/resources/src/mediawiki.widgets/images/page-disambiguation-ltr.svg index 0786048380..005f66e85a 100644 --- a/resources/src/mediawiki.widgets/images/page-disambiguation-ltr.svg +++ b/resources/src/mediawiki.widgets/images/page-disambiguation-ltr.svg @@ -1,4 +1,4 @@ - - + + diff --git a/resources/src/mediawiki.widgets/images/page-disambiguation-rtl.svg b/resources/src/mediawiki.widgets/images/page-disambiguation-rtl.svg index 753c9d56eb..7e56a70f7a 100644 --- a/resources/src/mediawiki.widgets/images/page-disambiguation-rtl.svg +++ b/resources/src/mediawiki.widgets/images/page-disambiguation-rtl.svg @@ -1,4 +1,4 @@ - - + + diff --git a/resources/src/mediawiki.widgets/images/page-existing-ltr.svg b/resources/src/mediawiki.widgets/images/page-existing-ltr.svg deleted file mode 100644 index 011a17199b..0000000000 --- a/resources/src/mediawiki.widgets/images/page-existing-ltr.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/src/mediawiki.widgets/images/page-existing-rtl.svg b/resources/src/mediawiki.widgets/images/page-existing-rtl.svg deleted file mode 100644 index db4ad43e60..0000000000 --- a/resources/src/mediawiki.widgets/images/page-existing-rtl.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/src/mediawiki.widgets/images/page-not-found-he-yi.svg b/resources/src/mediawiki.widgets/images/page-not-found-he-yi.svg index d8c68a9525..e1f19d232c 100644 --- a/resources/src/mediawiki.widgets/images/page-not-found-he-yi.svg +++ b/resources/src/mediawiki.widgets/images/page-not-found-he-yi.svg @@ -1,4 +1,4 @@ - - + + diff --git a/resources/src/mediawiki.widgets/images/page-not-found-ltr.svg b/resources/src/mediawiki.widgets/images/page-not-found-ltr.svg index bea394ab06..e1f19d232c 100644 --- a/resources/src/mediawiki.widgets/images/page-not-found-ltr.svg +++ b/resources/src/mediawiki.widgets/images/page-not-found-ltr.svg @@ -1,4 +1,4 @@ - - + + diff --git a/resources/src/mediawiki.widgets/images/page-not-found-rtl.svg b/resources/src/mediawiki.widgets/images/page-not-found-rtl.svg index bb6f31614a..75b310cbb3 100644 --- a/resources/src/mediawiki.widgets/images/page-not-found-rtl.svg +++ b/resources/src/mediawiki.widgets/images/page-not-found-rtl.svg @@ -1,4 +1,4 @@ - - + + diff --git a/resources/src/mediawiki.widgets/images/page-redirect-ltr.svg b/resources/src/mediawiki.widgets/images/page-redirect-ltr.svg deleted file mode 100644 index f296ac588f..0000000000 --- a/resources/src/mediawiki.widgets/images/page-redirect-ltr.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/src/mediawiki.widgets/images/page-redirect-rtl.svg b/resources/src/mediawiki.widgets/images/page-redirect-rtl.svg deleted file mode 100644 index 6c753d6312..0000000000 --- a/resources/src/mediawiki.widgets/images/page-redirect-rtl.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js index 661f9aecd6..dc702c82de 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js @@ -33,11 +33,11 @@ } else if ( config.missing ) { icon = 'page-not-found'; } else if ( config.redirect ) { - icon = 'page-redirect'; + icon = 'articleRedirect'; } else if ( config.disambiguation ) { icon = 'page-disambiguation'; } else { - icon = 'page-existing'; + icon = 'article'; } // Config initialization diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less index e52d0cdc3f..9830c109e1 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less @@ -39,6 +39,7 @@ left: 0; &:not( .mw-widget-titleOptionWidget-hasImage ) { + background-size: 80%; background-color: #c8ccd1; opacity: 0.4; } @@ -90,22 +91,13 @@ background-image: url( images/page-disambiguation-ltr.svg ); } -.oo-ui-icon-page-existing { - /* @embed */ - background-image: url( images/page-existing-ltr.svg ); -} - .oo-ui-icon-page-not-found { /* @embed */ background-image: url( images/page-not-found-ltr.svg ); } -.oo-ui-icon-page-not-found:lang( he ) { +.oo-ui-icon-page-not-found:lang( he ), +.oo-ui-icon-page-not-found:lang( yi ) { /* @embed */ background-image: url( images/page-not-found-he-yi.svg ); } - -.oo-ui-icon-page-redirect { - /* @embed */ - background-image: url( images/page-redirect-ltr.svg ); -} -- 2.20.1