From 751dd0ae350110a7793ddac29a8d87c742f13dbf Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 26 Nov 2019 11:30:38 -0600 Subject: [PATCH] Correctly align the about page. Issue #1351 --- NetNewsWire.xcodeproj/project.pbxproj | 4 ---- iOS/Resources/About.rtf | 4 ++-- iOS/Resources/Acknowledgments.rtf | 11 ----------- iOS/Resources/Credits.rtf | 11 +++++++---- iOS/Resources/Dedication.rtf | 2 +- iOS/Resources/Thanks.rtf | 6 +++--- iOS/Settings/Settings.storyboard | 26 +++++++++++++------------- 7 files changed, 26 insertions(+), 38 deletions(-) delete mode 100644 iOS/Resources/Acknowledgments.rtf diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index a9acae6f3..00835364a 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -245,7 +245,6 @@ 51EF0F902279C9500050506E /* AccountsAddViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51EF0F8F2279C9500050506E /* AccountsAddViewController.swift */; }; 51EF0F922279CA620050506E /* AccountsAddTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51EF0F912279CA620050506E /* AccountsAddTableCellView.swift */; }; 51F85BEB22724CB600C787DC /* About.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BEA22724CB600C787DC /* About.rtf */; }; - 51F85BED227251DF00C787DC /* Acknowledgments.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BEC227251DF00C787DC /* Acknowledgments.rtf */; }; 51F85BEF2272520B00C787DC /* Thanks.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BEE2272520B00C787DC /* Thanks.rtf */; }; 51F85BF12272524100C787DC /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BF02272524100C787DC /* Credits.rtf */; }; 51F85BF32272531500C787DC /* Dedication.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BF22272531500C787DC /* Dedication.rtf */; }; @@ -1363,7 +1362,6 @@ 51EF0F8F2279C9500050506E /* AccountsAddViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsAddViewController.swift; sourceTree = ""; }; 51EF0F912279CA620050506E /* AccountsAddTableCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsAddTableCellView.swift; sourceTree = ""; }; 51F85BEA22724CB600C787DC /* About.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = About.rtf; sourceTree = ""; }; - 51F85BEC227251DF00C787DC /* Acknowledgments.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Acknowledgments.rtf; sourceTree = ""; }; 51F85BEE2272520B00C787DC /* Thanks.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Thanks.rtf; sourceTree = ""; }; 51F85BF02272524100C787DC /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; 51F85BF22272531500C787DC /* Dedication.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Dedication.rtf; sourceTree = ""; }; @@ -2603,7 +2601,6 @@ children = ( 51F85BEA22724CB600C787DC /* About.rtf */, 51F85BF02272524100C787DC /* Credits.rtf */, - 51F85BEC227251DF00C787DC /* Acknowledgments.rtf */, 51F85BEE2272520B00C787DC /* Thanks.rtf */, 51F85BF22272531500C787DC /* Dedication.rtf */, 51BB7C302335ACDE008E8144 /* page.html */, @@ -3444,7 +3441,6 @@ 516A09422361248000EAE89B /* Inspector.storyboard in Resources */, 84C9FCA42262A1B800D921D6 /* LaunchScreenPhone.storyboard in Resources */, 51F85BEB22724CB600C787DC /* About.rtf in Resources */, - 51F85BED227251DF00C787DC /* Acknowledgments.rtf in Resources */, 516A093B2360A4A000EAE89B /* SettingsTableViewCell.xib in Resources */, 511D43D1231FA62800FB1562 /* SidebarKeyboardShortcuts.plist in Resources */, 516A09402361240900EAE89B /* Account.storyboard in Resources */, diff --git a/iOS/Resources/About.rtf b/iOS/Resources/About.rtf index dca510b3a..9f2ae4571 100644 --- a/iOS/Resources/About.rtf +++ b/iOS/Resources/About.rtf @@ -2,8 +2,8 @@ \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande-Bold;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red10\green96\blue255;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\cssrgb\c0\c47843\c100000\cname systemBlueColor;} -\margl1440\margr1440\vieww11860\viewh9620\viewkind0 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0 +\margl1440\margr1440\vieww8340\viewh9300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li363\fi-364\pardirnatural\partightenfactor0 \f0\b\fs28 \cf2 By Brent Simmons and the NetNewsWire team \fs22 \ diff --git a/iOS/Resources/Acknowledgments.rtf b/iOS/Resources/Acknowledgments.rtf deleted file mode 100644 index 7404f7a5f..000000000 --- a/iOS/Resources/Acknowledgments.rtf +++ /dev/null @@ -1,11 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2511 -\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} -{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} -\margl1440\margr1440\vieww8960\viewh8160\viewkind0 -\deftab720 -\pard\tx0\pardeftab720\sa60\partightenfactor0 -{\field{\*\fldinst{HYPERLINK "https://github.com/ccgus/fmdb"}}{\fldrslt -\f0\fs22 \cf2 FMDB}} -\f0\fs22 \cf2 is by {\field{\*\fldinst{HYPERLINK "http://flyingmeat.com/"}}{\fldrslt Flying Meat Software}}\ -} \ No newline at end of file diff --git a/iOS/Resources/Credits.rtf b/iOS/Resources/Credits.rtf index 057f767f3..10327f37d 100644 --- a/iOS/Resources/Credits.rtf +++ b/iOS/Resources/Credits.rtf @@ -9,8 +9,11 @@ \f0\fs22 \cf2 iOS app design: {\field{\*\fldinst{HYPERLINK "https://inessential.com/"}}{\fldrslt Brent Simmons}} and {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}\ Lead iOS developer: {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}\ App icon: {\field{\*\fldinst{HYPERLINK "https://twitter.com/BradEllis"}}{\fldrslt Brad Ellis}}\ -\pard\pardeftab720\sa60\partightenfactor0 +\pard\pardeftab720\li366\fi-367\sa60\partightenfactor0 \cf2 Feedly syncing: {\field{\*\fldinst{HYPERLINK "https://twitter.com/kielgillard"}}{\fldrslt Kiel Gillard}}\ -Newsfoot (JS footnote displayer): {\field{\*\fldinst{HYPERLINK "https://github.com/brehaut/"}}{\fldrslt Andrew Brehaut}}\ -Help book: {\field{\*\fldinst{HYPERLINK "https://nostodnayr.net/"}}{\fldrslt Ryan Dotson}}\ -And more {\field{\*\fldinst{HYPERLINK "https://github.com/brentsimmons/NetNewsWire/graphs/contributors"}}{\fldrslt contributors}}!} \ No newline at end of file +\pard\pardeftab720\li362\fi-363\sa60\partightenfactor0 +\cf2 Newsfoot (JS footnote displayer): {\field{\*\fldinst{HYPERLINK "https://github.com/brehaut/"}}{\fldrslt Andrew Brehaut}}\ +\pard\pardeftab720\li355\fi-356\sa60\partightenfactor0 +\cf2 Help book: {\field{\*\fldinst{HYPERLINK "https://nostodnayr.net/"}}{\fldrslt Ryan Dotson}}\ +\pard\pardeftab720\li358\fi-359\sa60\partightenfactor0 +\cf2 And more {\field{\*\fldinst{HYPERLINK "https://github.com/brentsimmons/NetNewsWire/graphs/contributors"}}{\fldrslt contributors}}!} \ No newline at end of file diff --git a/iOS/Resources/Dedication.rtf b/iOS/Resources/Dedication.rtf index 2fecd1091..328808bb7 100644 --- a/iOS/Resources/Dedication.rtf +++ b/iOS/Resources/Dedication.rtf @@ -4,6 +4,6 @@ {\*\expandedcolortbl;;\cssrgb\c0\c0\c0;} \margl1440\margr1440\vieww9000\viewh8400\viewkind0 \deftab720 -\pard\pardeftab720\sa60\partightenfactor0 +\pard\pardeftab720\li354\fi-355\sa60\partightenfactor0 \f0\fs28 \cf2 NetNewsWire 5.0 is dedicated to all the people who showed up to help with code, design, HTML, documentation, icons, testing, and just to help talk things over and think things through. This app\'92s for you!} \ No newline at end of file diff --git a/iOS/Resources/Thanks.rtf b/iOS/Resources/Thanks.rtf index 1caa476b5..85592b61a 100644 --- a/iOS/Resources/Thanks.rtf +++ b/iOS/Resources/Thanks.rtf @@ -2,10 +2,10 @@ \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} -\margl1440\margr1440\vieww12580\viewh11720\viewkind0 +\margl1440\margr1440\vieww11780\viewh11640\viewkind0 \deftab720 -\pard\pardeftab720\sa60\partightenfactor0 +\pard\pardeftab720\li365\fi-366\sa60\partightenfactor0 \f0\fs22 \cf2 Thanks to Sheila and my family; thanks to my friends in Seattle and around the globe; thanks to my co-workers and friends at {\field{\*\fldinst{HYPERLINK "https://www.omnigroup.com"}}{\fldrslt the Omni Group}}; thanks to the ever-patient and ever-awesome NetNewsWire beta testers. \ -\pard\tx0\pardeftab720\sa60\partightenfactor0 +\pard\tx0\pardeftab720\li360\fi-361\sa60\partightenfactor0 \cf2 Thanks to {\field{\*\fldinst{HYPERLINK "https://shapeof.com/"}}{\fldrslt Gus Mueller}} for {\field{\*\fldinst{HYPERLINK "https://github.com/ccgus/fmdb"}}{\fldrslt FMDB}} by {\field{\*\fldinst{HYPERLINK "http://flyingmeat.com/"}}{\fldrslt Flying Meat Software}}. Thanks to {\field{\*\fldinst{HYPERLINK "https://github.com"}}{\fldrslt GitHub}} and {\field{\*\fldinst{HYPERLINK "https://slack.com"}}{\fldrslt Slack}} for making open source collaboration easy and fun. Thanks to {\field{\*\fldinst{HYPERLINK "https://benubois.com/"}}{\fldrslt Ben Ubois}} at {\field{\*\fldinst{HYPERLINK "https://feedbin.com/"}}{\fldrslt Feedbin}} for all the extra help with syncing and article rendering.} \ No newline at end of file diff --git a/iOS/Settings/Settings.storyboard b/iOS/Settings/Settings.storyboard index dbb52f8f5..84f54dfdf 100644 --- a/iOS/Settings/Settings.storyboard +++ b/iOS/Settings/Settings.storyboard @@ -575,17 +575,17 @@ - + - + - + @@ -601,17 +601,17 @@ - + - + - + @@ -627,7 +627,7 @@ - + @@ -635,8 +635,8 @@ - - + + @@ -653,7 +653,7 @@ - + @@ -661,9 +661,9 @@ - - - + + +