[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility t...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354620 ) Change subject: [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme .. [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme Deprecated since v0.22.0. Change-Id: I931638ceb91afbb678868f108ffcd65481adda6f --- M Gruntfile.js M README.md M bin/testsuitegenerator.rb M build/modules.yaml D php/themes/MediaWikiTheme.php D src/themes/mediawiki/MediaWikiTheme.js D src/themes/mediawiki/theme.less 7 files changed, 1 insertion(+), 41 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js index d825bf4..ad7c4cb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,7 +7,6 @@ pkg = grunt.file.readJSON( 'package.json' ), themes = { wikimediaui: 'WikimediaUI', // Do not change this line or you'll break `grunt add-theme` - mediawiki: 'MediaWiki', // Backwards-compatibility wrapper apex: 'Apex' }, lessFiles = {}, diff --git a/README.md b/README.md index 6ee88c4..b893890 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ * One of `oojs-ui-wikimediaui.css` or `oojs-ui-apex.css`, containing theme-specific styles; and * One of `oojs-ui-wikimediaui.js` or `oojs-ui-apex.js`, containing theme-specific code -You can load additional icon packs from files named `oojs-ui-mediawiki-icons-*.css` or `oojs-ui-apex-icons-*.css`. +You can load additional icon packs from files named `oojs-ui-wikimediaui-icons-*.css` or `oojs-ui-apex-icons-*.css`. The remaining files make it possible to load only parts of the whole library. diff --git a/bin/testsuitegenerator.rb b/bin/testsuitegenerator.rb index 3770661..5c7da37 100644 --- a/bin/testsuitegenerator.rb +++ b/bin/testsuitegenerator.rb @@ -21,7 +21,6 @@ testable_classes = classes .reject{|c| c[:abstract] } # can't test abstract classes .reject{|c| !c[:parent] || c[:trait] || c[:parent] == 'Theme' } # can't test abstract - .reject{|c| c[:name] == 'MediaWikiTheme' } # can't test abstract .reject{|c| %w[Element Widget Layout Theme].include? c[:name] } # no toplevel make_class_instance_placeholder = lambda do |klass, config| diff --git a/build/modules.yaml b/build/modules.yaml index 209ceb9..009d003 100644 --- a/build/modules.yaml +++ b/build/modules.yaml @@ -260,12 +260,6 @@ ], "theme": "wikimediaui" }, - "oojs-ui-mediawiki-icons-location": { - "styles": [ - "src/themes/wikimediaui/icons-location.json" - ], - "theme": "wikimediaui" - }, "oojs-ui-{theme}-icons-user": { "styles": [ "src/themes/{theme}/icons-user.json" @@ -277,12 +271,6 @@ ] }, "oojs-ui-wikimediaui-icons-wikimedia": { - "styles": [ - "src/themes/wikimediaui/icons-wikimedia.json" - ], - "theme": "wikimediaui" - }, - "oojs-ui-mediawiki-icons-wikimedia": { "styles": [ "src/themes/wikimediaui/icons-wikimedia.json" ], diff --git a/php/themes/MediaWikiTheme.php b/php/themes/MediaWikiTheme.php deleted file mode 100644 index 1c37218..000 --- a/php/themes/MediaWikiTheme.php +++ /dev/null @@ -1,6 +0,0 @@ -https://gerrit.wikimedia.org/r/354620 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I931638ceb91afbb678868f108ffcd65481adda6f Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Jforrester Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility t...
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354620 ) Change subject: [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme .. [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme Deprecated since v0.22.0. Change-Id: I931638ceb91afbb678868f108ffcd65481adda6f --- M Gruntfile.js M bin/testsuitegenerator.rb M build/modules.yaml D php/themes/MediaWikiTheme.php D src/themes/mediawiki/MediaWikiTheme.js D src/themes/mediawiki/theme.less 6 files changed, 0 insertions(+), 46 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/20/354620/1 diff --git a/Gruntfile.js b/Gruntfile.js index 9f3bbac..5ee4a6b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,7 +7,6 @@ pkg = grunt.file.readJSON( 'package.json' ), themes = { wikimediaui: 'WikimediaUI', // Do not change this line or you'll break `grunt add-theme` - mediawiki: 'MediaWiki', // Backwards-compatibility wrapper apex: 'Apex' }, lessFiles = {}, diff --git a/bin/testsuitegenerator.rb b/bin/testsuitegenerator.rb index bada71b..dec65b4 100644 --- a/bin/testsuitegenerator.rb +++ b/bin/testsuitegenerator.rb @@ -21,7 +21,6 @@ testable_classes = classes .reject{|c| c[:abstract] } # can't test abstract classes .reject{|c| !c[:parent] || c[:trait] || c[:parent] == 'Theme' } # can't test abstract - .reject{|c| c[:name] == 'MediaWikiTheme' } # can't test abstract .reject{|c| %w[Element Widget Layout Theme].include? c[:name] } # no toplevel make_class_instance_placeholder = lambda do |klass, config| diff --git a/build/modules.yaml b/build/modules.yaml index 9e965dc..b68dfde 100644 --- a/build/modules.yaml +++ b/build/modules.yaml @@ -205,12 +205,6 @@ ], "theme": "wikimediaui" }, - "oojs-ui-mediawiki-icons-accessibility": { - "styles": [ - "src/themes/wikimediaui/icons-accessibility.json" - ], - "theme": "wikimediaui" - }, "oojs-ui-{theme}-icons-movement": { "styles": [ "src/themes/{theme}/icons-movement.json" @@ -267,12 +261,6 @@ ], "theme": "wikimediaui" }, - "oojs-ui-mediawiki-icons-location": { - "styles": [ - "src/themes/wikimediaui/icons-location.json" - ], - "theme": "wikimediaui" - }, "oojs-ui-{theme}-icons-user": { "styles": [ "src/themes/{theme}/icons-user.json" @@ -284,12 +272,6 @@ ] }, "oojs-ui-wikimediaui-icons-wikimedia": { - "styles": [ - "src/themes/wikimediaui/icons-wikimedia.json" - ], - "theme": "wikimediaui" - }, - "oojs-ui-mediawiki-icons-wikimedia": { "styles": [ "src/themes/wikimediaui/icons-wikimedia.json" ], diff --git a/php/themes/MediaWikiTheme.php b/php/themes/MediaWikiTheme.php deleted file mode 100644 index 1c37218..000 --- a/php/themes/MediaWikiTheme.php +++ /dev/null @@ -1,6 +0,0 @@ -https://gerrit.wikimedia.org/r/354620 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I931638ceb91afbb678868f108ffcd65481adda6f Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits