From 84a8cb1a0eeef63ab6a73c156fe05abaea4628ff Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 11 Feb 2018 18:58:01 -0800
Subject: [PATCH] Punt font size till after 1.0.

---
 Evergreen/AppDefaults.swift                 |  19 +--
 Evergreen/Base.lproj/Preferences.storyboard | 130 ++------------------
 2 files changed, 19 insertions(+), 130 deletions(-)

diff --git a/Evergreen/AppDefaults.swift b/Evergreen/AppDefaults.swift
index 79fa7f561..6841b0b61 100644
--- a/Evergreen/AppDefaults.swift
+++ b/Evergreen/AppDefaults.swift
@@ -135,14 +135,17 @@ private extension AppDefaults {
 
 	func fontSize(for key: String) -> FontSize {
 
-		var rawFontSize = int(for: key)
-		if rawFontSize < smallestFontSizeRawValue {
-			rawFontSize = smallestFontSizeRawValue
-		}
-		if rawFontSize > largestFontSizeRawValue {
-			rawFontSize = largestFontSizeRawValue
-		}
-		return FontSize(rawValue: rawFontSize)!
+		// Punted till after 1.0.
+		return .medium
+
+//		var rawFontSize = int(for: key)
+//		if rawFontSize < smallestFontSizeRawValue {
+//			rawFontSize = smallestFontSizeRawValue
+//		}
+//		if rawFontSize > largestFontSizeRawValue {
+//			rawFontSize = largestFontSizeRawValue
+//		}
+//		return FontSize(rawValue: rawFontSize)!
 	}
 	
 	func setFontSize(for key: String, _ fontSize: FontSize) {
diff --git a/Evergreen/Base.lproj/Preferences.storyboard b/Evergreen/Base.lproj/Preferences.storyboard
index 0ede97a0b..7db1ae995 100644
--- a/Evergreen/Base.lproj/Preferences.storyboard
+++ b/Evergreen/Base.lproj/Preferences.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="mPU-HG-I4u">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14092" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="mPU-HG-I4u">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14092"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -31,11 +31,11 @@
             <objects>
                 <viewController title="General" storyboardIdentifier="General" id="iuH-lz-18x" sceneMemberID="viewController">
                     <view key="view" id="WnV-px-wCT">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="223"/>
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="98"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ucw-vG-yLt">
-                                <rect key="frame" x="98" y="185" width="92" height="17"/>
+                                <rect key="frame" x="98" y="60" width="92" height="17"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Refresh feeds:" id="F7c-lm-g97">
                                     <font key="font" metaFont="system"/>
@@ -44,7 +44,7 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SFF-mL-yc8">
-                                <rect key="frame" x="194" y="179" width="212" height="26"/>
+                                <rect key="frame" x="194" y="54" width="212" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <popUpButtonCell key="cell" type="push" title="Every 30 minutes" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="rZU-Tg-xwo" id="Jwn-HD-eP6">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -64,7 +64,7 @@
                                 </popUpButtonCell>
                             </popUpButton>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wsb-Lr-8Q7">
-                                <rect key="frame" x="114" y="145" width="76" height="17"/>
+                                <rect key="frame" x="114" y="20" width="76" height="17"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Web pages:" id="CgU-dE-Qtb">
                                     <font key="font" metaFont="system"/>
@@ -73,7 +73,7 @@
                                 </textFieldCell>
                             </textField>
                             <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ubm-Pk-l7x">
-                                <rect key="frame" x="194" y="144" width="211" height="18"/>
+                                <rect key="frame" x="194" y="19" width="211" height="18"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <buttonCell key="cell" type="check" title="Open in background in browser" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="t0a-LN-rCv">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -93,127 +93,13 @@
                                     </binding>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="37V-fn-0pB">
-                                <rect key="frame" x="80" y="104" width="110" height="17"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Sidebar font size:" id="3fQ-t1-Q7u">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jDZ-h5-3Jf">
-                                <rect key="frame" x="194" y="99" width="124" height="26"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <popUpButtonCell key="cell" type="push" title="Medium" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="dnp-1z-Uvr" id="rIw-e4-7Aq">
-                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
-                                    <menu key="menu" id="o7F-Qd-W5X">
-                                        <items>
-                                            <menuItem title="Small" id="W5Y-pQ-VJH"/>
-                                            <menuItem title="Medium" state="on" id="dnp-1z-Uvr"/>
-                                            <menuItem title="Large" id="Nxt-uw-D4P"/>
-                                            <menuItem title="Very Large" id="IzO-QD-xth"/>
-                                        </items>
-                                    </menu>
-                                </popUpButtonCell>
-                                <connections>
-                                    <binding destination="mAF-gO-1PI" name="selectedIndex" keyPath="values.sidebarFontSize" id="HM0-fC-V0e">
-                                        <dictionary key="options">
-                                            <bool key="NSAllowsEditingMultipleValuesSelection" value="NO"/>
-                                            <bool key="NSConditionallySetsEnabled" value="NO"/>
-                                            <integer key="NSMultipleValuesPlaceholder" value="0"/>
-                                            <integer key="NSNoSelectionPlaceholder" value="0"/>
-                                            <integer key="NSNotApplicablePlaceholder" value="0"/>
-                                            <integer key="NSNullPlaceholder" value="0"/>
-                                            <bool key="NSRaisesForNotApplicableKeys" value="NO"/>
-                                        </dictionary>
-                                    </binding>
-                                </connections>
-                            </popUpButton>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jZa-qi-vJE">
-                                <rect key="frame" x="75" y="63" width="115" height="17"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Timeline font size:" id="W38-nc-va6">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZiV-it-cLB">
-                                <rect key="frame" x="194" y="58" width="124" height="26"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <popUpButtonCell key="cell" type="push" title="Medium" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="KBG-NC-Npp" id="GXY-Lm-RXR">
-                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
-                                    <menu key="menu" id="Mp5-tg-0Sm">
-                                        <items>
-                                            <menuItem title="Small" id="DW6-5v-CHd"/>
-                                            <menuItem title="Medium" state="on" id="KBG-NC-Npp"/>
-                                            <menuItem title="Large" id="pu9-sC-1Gu"/>
-                                            <menuItem title="Very Large" id="Dtx-X2-XO6"/>
-                                        </items>
-                                    </menu>
-                                </popUpButtonCell>
-                                <connections>
-                                    <binding destination="mAF-gO-1PI" name="selectedIndex" keyPath="values.timelineFontSize" id="Aze-zk-HxT">
-                                        <dictionary key="options">
-                                            <bool key="NSAllowsEditingMultipleValuesSelection" value="NO"/>
-                                            <bool key="NSConditionallySetsEnabled" value="NO"/>
-                                            <integer key="NSMultipleValuesPlaceholder" value="0"/>
-                                            <integer key="NSNoSelectionPlaceholder" value="0"/>
-                                            <integer key="NSNotApplicablePlaceholder" value="0"/>
-                                            <integer key="NSNullPlaceholder" value="0"/>
-                                            <bool key="NSRaisesForNotApplicableKeys" value="NO"/>
-                                        </dictionary>
-                                    </binding>
-                                </connections>
-                            </popUpButton>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PWb-nl-apa">
-                                <rect key="frame" x="87" y="22" width="103" height="17"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Article font size:" id="LLW-Wb-ZoV">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yun-nK-7NI">
-                                <rect key="frame" x="194" y="17" width="124" height="26"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <popUpButtonCell key="cell" type="push" title="Medium" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="FFd-Jt-Lnz" id="TkT-fo-bT9">
-                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
-                                    <menu key="menu" id="qqy-w5-kEQ">
-                                        <items>
-                                            <menuItem title="Small" id="kum-vW-RC1"/>
-                                            <menuItem title="Medium" state="on" id="FFd-Jt-Lnz"/>
-                                            <menuItem title="Large" id="Vym-ki-9jl"/>
-                                            <menuItem title="Very Large" id="Sk0-Bz-8sN"/>
-                                        </items>
-                                    </menu>
-                                </popUpButtonCell>
-                                <connections>
-                                    <binding destination="mAF-gO-1PI" name="selectedIndex" keyPath="values.articleFontSize" id="1e0-rF-4xY">
-                                        <dictionary key="options">
-                                            <bool key="NSAllowsEditingMultipleValuesSelection" value="NO"/>
-                                            <bool key="NSConditionallySetsEnabled" value="NO"/>
-                                            <integer key="NSMultipleValuesPlaceholder" value="0"/>
-                                            <integer key="NSNoSelectionPlaceholder" value="0"/>
-                                            <integer key="NSNotApplicablePlaceholder" value="0"/>
-                                            <integer key="NSNullPlaceholder" value="0"/>
-                                            <bool key="NSRaisesForNotApplicableKeys" value="NO"/>
-                                        </dictionary>
-                                    </binding>
-                                </connections>
-                            </popUpButton>
                         </subviews>
                     </view>
                 </viewController>
                 <customObject id="bSQ-tq-wd3" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <userDefaultsController representsSharedInstance="YES" id="mAF-gO-1PI"/>
             </objects>
-            <point key="canvasLocation" x="-61" y="475"/>
+            <point key="canvasLocation" x="-61" y="412"/>
         </scene>
         <!--Container-->
         <scene sceneID="fzS-hg-3TF">