Merge commit '1765236d80678b34770410963eb03b636bc97c01' into new-buil…

…d-script
Ranchero-Software · Sep 1, 2018 · 873db47 · 873db47
2 parents aa2b0af + 1765236
commit 873db47
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 363 deletions.
diff --git a/NetNewsWire/Base.lproj/MainWindow.storyboard b/NetNewsWire/Base.lproj/MainWindow.storyboard
@@ -660,7 +660,7 @@
                                 </constraints>
                             </view>
                             <color key="borderColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                            <color key="fillColor" name="underPageBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            <color key="fillColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </box>
                     </subviews>
                     <constraints>

diff --git a/NetNewsWire/Info.plist b/NetNewsWire/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0d42</string>
+	<string>5.0d1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

diff --git a/Technotes/Roadmap.md b/Technotes/Roadmap.md
@@ -4,7 +4,7 @@
 
 This roadmap reflects thinking at the time of the last update. Anything can change at any time.
 
-## NetNewsWire 1.0 for macOS
+## NetNewsWire 5.0 for macOS
 
 Features:
 
@@ -25,9 +25,9 @@ Features:
 
 Milestones:
 
-[NetNewsWire 1.0 alpha](https://github.com/brentsimmons/NetNewsWire/milestone/1)<br />
-[NetNewsWire 1.0 beta](https://github.com/brentsimmons/NetNewsWire/milestone/2)<br />
-[NetNewsWire 1.0](https://github.com/brentsimmons/NetNewsWire/milestone/3)
+[NetNewsWire 5.0 alpha](https://github.com/brentsimmons/NetNewsWire/milestone/1)<br />
+[NetNewsWire 5.0 beta](https://github.com/brentsimmons/NetNewsWire/milestone/2)<br />
+[NetNewsWire 5.0](https://github.com/brentsimmons/NetNewsWire/milestone/3)
 
 (See [What Development, Alpha, Beta, and Final Mean for NetNewsWire](DevelopmentAlphaBeta.md) for definitions.)
 

diff --git a/buildNetNewsWire → buildnnw b/buildNetNewsWire → buildnnw
diff --git a/cleanPrefsAndData b/cleanPrefsAndData
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-defaults delete com.ranchero.evergreen
+defaults delete com.ranchero.NetNewsWire-Evergreen
 killall cfprefsd
 
-rm -rf ~/Library/Application\ Support/Evergreen/
+rm -rf ~/Library/Application\ Support/NetNewsWire/
 
diff --git a/test.html b/test.html
diff --git a/website/pages/index.markdown b/website/pages/index.markdown
diff --git a/website/posts/2017/12/22/inching_toward_usability.markdown b/website/posts/2017/12/22/inching_toward_usability.markdown
diff --git a/website/posts/2017/12/23/roadmap.markdown b/website/posts/2017/12/23/roadmap.markdown
diff --git a/website/snippets/footer.html b/website/snippets/footer.html
diff --git a/website/snippets/header.html b/website/snippets/header.html
diff --git a/website/styles/styleSheet.css b/website/styles/styleSheet.css
diff --git a/website/templates/page.html b/website/templates/page.html