Remove popout styles (#3747)

* Remove popout styles * Make popout-square fall back to flat-square
badges · Jul 22, 2019 · ecb85ce · ecb85ce
1 parent ec6512b
commit ecb85ce
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 70 deletions.
diff --git a/gh-badges/lib/make-badge.js b/gh-badges/lib/make-badge.js
@@ -131,15 +131,10 @@ module.exports = function makeBadge({
   }
 
   if (!(template in templates)) {
-    template = 'flat'
-  }
-  if (template.startsWith('popout')) {
-    if (logo) {
-      logoPosition =
-        logoPosition <= 10 && logoPosition >= -10 ? logoPosition : 0
-      logoWidth = +logoWidth || 32
+    if (template && template.endsWith('-square')) {
+      template = 'flat-square'
     } else {
-      template = template.replace('popout', 'flat')
+      template = 'flat'
     }
   }
   if (template === 'social') {

diff --git a/gh-badges/lib/make-badge.spec.js b/gh-badges/lib/make-badge.spec.js
@@ -122,6 +122,22 @@ describe('The badge generator', function() {
         .to.equal(jsonBadgeWithDefaultStyle)
         .and.to.satisfy(isSvg)
     })
+
+    it('should replace "popout-square" svg template with "flat-square"', function() {
+      const jsonBadgeWithUnknownStyle = makeBadge({
+        text: ['name', 'Bob'],
+        format: 'svg',
+        template: 'popout-square',
+      })
+      const jsonBadgeWithDefaultStyle = makeBadge({
+        text: ['name', 'Bob'],
+        format: 'svg',
+        template: 'flat-square',
+      })
+      expect(jsonBadgeWithUnknownStyle)
+        .to.equal(jsonBadgeWithDefaultStyle)
+        .and.to.satisfy(isSvg)
+    })
   })
 
   describe('"for-the-badge" template badge generation', function() {

diff --git a/gh-badges/templates/popout-square-template.svg b/gh-badges/templates/popout-square-template.svg
diff --git a/gh-badges/templates/popout-template.svg b/gh-badges/templates/popout-template.svg
diff --git a/scripts/export-supported-features-cli.js b/scripts/export-supported-features-cli.js
@@ -17,8 +17,6 @@ const supportedFeatures = {
     'flat',
     'flat-square',
     'for-the-badge',
-    'popout',
-    'popout-square',
     'social',
   ],
 }