From e8bb4ac0e0c3bc4d4dbe8911f655ff12d6306148 Mon Sep 17 00:00:00 2001
From: Jake Dexheimer <jakedex@gmail.com>
Date: Mon, 5 Mar 2018 18:59:53 -0600
Subject: [PATCH 1/3] Add button dropdown

---
 components/Dropdown.js      | 23 +++++++++++++++++------
 components/svg/Arrowdown.js |  4 ++--
 pages/editor.js             | 15 +++++----------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/components/Dropdown.js b/components/Dropdown.js
index 75526f9..36f553f 100644
--- a/components/Dropdown.js
+++ b/components/Dropdown.js
@@ -41,7 +41,11 @@ class Dropdown extends React.Component {
             background: ${COLORS.BLACK};
             user-select: none;
             padding: 8px 16px;
-            border-bottom: 1px solid ${COLORS.SECONDARY};
+            border-bottom: 1px solid ${this.props.color || COLORS.SECONDARY};
+          }
+
+          .dropdown-list-item span {
+            color: ${this.props.color || '#fff'};
           }
 
           .dropdown-list-item:hover {
@@ -58,8 +62,11 @@ class Dropdown extends React.Component {
   }
 
   render() {
+    const color = this.props.color || COLORS.SECONDARY
+
     // find longest list value in number of characters
-    const MIN_WIDTH = this.props.list.reduce(
+    const list = this.props.button ? [...this.props.list, this.props.selected] : this.props.list
+    const MIN_WIDTH = list.reduce(
       (max, { name }) => (name && name.length > max ? name.length : max),
       0
     )
@@ -67,13 +74,13 @@ class Dropdown extends React.Component {
     return (
       <div
         className="dropdown-container"
-        style={{ minWidth: MIN_WIDTH * 14 }}
+        style={{ minWidth: MIN_WIDTH * 10 + 32 }}
         onClick={this.toggle}
       >
         <div className={`dropdown-display ${this.state.isVisible ? 'is-visible' : ''}`}>
           <span style={{ minWidth: '4rem' }}>{this.props.selected.name}</span>
           <div className="arrow-down">
-            <ArrowDown />
+            <ArrowDown fill={color} />
           </div>
         </div>
         <div className="dropdown-list">{this.renderListItems()}</div>
@@ -98,7 +105,7 @@ class Dropdown extends React.Component {
 
           .dropdown-display {
             height: 100%;
-            border: 1px solid ${COLORS.SECONDARY};
+            border: 1px solid ${color};
             border-radius: 3px;
             user-select: none;
             padding: 8px 16px;
@@ -109,6 +116,10 @@ class Dropdown extends React.Component {
             z-index: 1;
           }
 
+          .dropdown-display span {
+            color: ${color};
+          }
+
           .dropdown-display:hover {
             background: ${COLORS.HOVER};
           }
@@ -120,7 +131,7 @@ class Dropdown extends React.Component {
           .dropdown-list {
             display: none;
             margin-top: -1px;
-            border: 1px solid ${COLORS.SECONDARY};
+            border: 1px solid ${color};
             border-radius: 0px 0px 3px 3px;
             max-height: 350px;
             overflow-y: scroll;
diff --git a/components/svg/Arrowdown.js b/components/svg/Arrowdown.js
index ba46d99..ea2d560 100644
--- a/components/svg/Arrowdown.js
+++ b/components/svg/Arrowdown.js
@@ -1,9 +1,9 @@
 import React from 'react'
 
-export default () => (
+export default ({ fill }) => (
   <svg xmlns="http://www.w3.org/2000/svg" width="10" height="6" viewBox="0 0 10 6">
     <path
-      fill="#fff"
+      fill={fill}
       fillRule="evenodd"
       d="M93.7890633,17.6396882 L97.4926052,14.0851393 C97.6061243,13.9716202 97.7196417,13.9716202 97.8331608,14.0851393 L98.4929872,14.723681 C98.6065063,14.8372001 98.6065063,14.9507175 98.4929872,15.0642366 L93.9593411,19.4063203 C93.9167714,19.4488899 93.8600127,19.4701744 93.7890633,19.4701744 C93.7181138,19.4701744 93.6613552,19.4488899 93.6187855,19.4063203 L89.0851393,15.0642366 C88.9716202,14.9507175 88.9716202,14.8372001 89.0851393,14.723681 L89.7449658,14.0851393 C89.8584849,13.9716202 89.9720022,13.9716202 90.0855213,14.0851393 L93.7890633,17.6396882 Z"
       transform="translate(-89 -14)"
diff --git a/pages/editor.js b/pages/editor.js
index 958eb21..3fd303d 100644
--- a/pages/editor.js
+++ b/pages/editor.js
@@ -76,7 +76,6 @@ class Editor extends React.Component {
         paddingHorizontal: '32px',
         uploading: false,
         code: props.content,
-        saveAs: 'png',
         _initialState: this.props.initialState
       },
       this.props.initialState
@@ -136,7 +135,7 @@ class Editor extends React.Component {
   save({ format } = { format: 'png' }) {
     this.getCarbonImage({ format }).then(dataUrl => {
       const link = document.createElement('a')
-      link.download = 'carbon.' + format
+      link.download = `carbon.${format}`
       link.href = dataUrl
       document.body.appendChild(link)
       link.click()
@@ -191,16 +190,12 @@ class Editor extends React.Component {
                 color="#57b5f9"
                 style={{ marginRight: '8px' }}
               />
-              <Button
-                onClick={e => this.save({ format: this.state.saveAs })}
-                title="Save Image"
-                color="#c198fb"
-                style={{ marginRight: '8px' }}
-              />
               <Dropdown
-                selected={{ id: this.state.saveAs, name: `(${this.state.saveAs.toUpperCase()})` }}
+                button
+                color="#c198fb"
+                selected={{ id: 'SAVE_IMAGE', name: 'Save Image' }}
                 list={['png', 'svg'].map(id => ({ id, name: id.toUpperCase() }))}
-                onChange={saveAs => this.setState({ saveAs: saveAs.id })}
+                onChange={saveAs => this.save({ format: saveAs.id })}
               />
             </div>
           </Toolbar>

From 12ce55b89aaa7b28f001f9b03d8c51a6aa2ad962 Mon Sep 17 00:00:00 2001
From: Jake Dexheimer <jakedex@gmail.com>
Date: Mon, 5 Mar 2018 19:00:08 -0600
Subject: [PATCH 2/3] Remove non-woff fonts

---
 components/style/Font.js | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/components/style/Font.js b/components/style/Font.js
index 3eb5aa0..d5c1de0 100644
--- a/components/style/Font.js
+++ b/components/style/Font.js
@@ -2,30 +2,20 @@ export default () => (
   <style jsx global>{`
     @font-face {
       font-family: 'Hack';
-      src: url('//cdn.jsdelivr.net/font-hack/2.020/fonts/eot/hack-regular-webfont.eot?v=2.020');
-      src: url('//cdn.jsdelivr.net/font-hack/2.020/fonts/eot/hack-regular-webfont.eot?#iefix&v=2.020')
-          format('embedded-opentype'),
-        url('//cdn.jsdelivr.net/font-hack/2.020/fonts/woff2/hack-regular-webfont.woff2?v=2.020')
+      src: url('//cdn.jsdelivr.net/font-hack/2.020/fonts/woff2/hack-regular-webfont.woff2?v=2.020')
           format('woff2'),
         url('//cdn.jsdelivr.net/font-hack/2.020/fonts/woff/hack-regular-webfont.woff?v=2.020')
-          format('woff'),
-        url('//cdn.jsdelivr.net/font-hack/2.020/fonts/web-ttf/hack-regular-webfont.ttf?v=2.020')
-          format('truetype');
+          format('woff');
       font-weight: 400;
       font-style: normal;
     }
 
     @font-face {
       font-family: 'Fira Code';
-      src: url('//cdn.rawgit.com/tonsky/FiraCode/1.204/distr/eot/FiraCode-Regular.eot');
-      src: url('//cdn.rawgit.com/tonsky/FiraCode/1.204/distr/eot/FiraCode-Regular.eot')
-          format('embedded-opentype'),
-        url('//cdn.rawgit.com/tonsky/FiraCode/1.204/distr/woff2/FiraCode-Regular.woff2')
+      src: url('//cdn.rawgit.com/tonsky/FiraCode/1.204/distr/woff2/FiraCode-Regular.woff2')
           format('woff2'),
         url('//cdn.rawgit.com/tonsky/FiraCode/1.204/distr/woff/FiraCode-Regular.woff')
-          format('woff'),
-        url('//cdn.rawgit.com/tonsky/FiraCode/1.204/distr/ttf/FiraCode-Regular.ttf')
-          format('truetype');
+          format('woff');
       font-weight: 400;
       font-style: normal;
     }

From 4d9793f3df57db81aac55ff84ca8ae00d8f3d425 Mon Sep 17 00:00:00 2001
From: Jake Dexheimer <jakedex@gmail.com>
Date: Mon, 5 Mar 2018 19:00:08 -0600
Subject: [PATCH 3/3] Remove non-woff fonts

---
 components/style/Font.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/components/style/Font.js b/components/style/Font.js
index 83d6f8d..ced1d96 100644
--- a/components/style/Font.js
+++ b/components/style/Font.js
@@ -2,13 +2,8 @@ export default () => (
   <style jsx global>{`
     @font-face {
       font-family: 'Iosevka';
-      src: url('//cdn.jsdelivr.net/npm/@typopro/web-iosevka@3.7.5/TypoPRO-iosevka-term-bold.eot');
-      src: url('//cdn.jsdelivr.net/npm/@typopro/web-iosevka@3.7.5/TypoPRO-iosevka-term-bold.eot')
-          format('embedded-opentype'),
-        url('//cdn.jsdelivr.net/npm/@typopro/web-iosevka@3.7.5/TypoPRO-iosevka-term-bold.woff')
-          format('woff'),
-        url('//cdn.jsdelivr.net/npm/@typopro/web-iosevka@3.7.5/TypoPRO-iosevka-term-bold.ttf')
-          format('truetype');
+      src: url('//cdn.jsdelivr.net/npm/@typopro/web-iosevka@3.7.5/TypoPRO-iosevka-term-bold.woff')
+        format('woff');
       font-weight: 400;
       font-style: normal;
     }