Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate

iOS/Article/WebViewController.swift

@@ -180,9 +180,9 @@ class WebViewController: UIViewController {
 	}
 	
 	func fullReload() {
-		if let offset = webView?.scrollView.contentOffset.y {
-			restoreOffset = Int(offset)
-			webView?.reload()
+		webView?.evaluateJavaScript("window.scrollY") { (scrollY, _) in
+			self.restoreOffset = scrollY as! Int
+			self.reloadHTML()
 		}
 	}
 
@@ -436,7 +436,9 @@ private extension WebViewController {
 		// play on the iPad where we aren't constantly pushing and popping this controller.
 		if (renderingTracker > 10) {
 			reloadHTML()
+			return
 		}
+		
 		renderingTracker += 1
 		
 		let style = ArticleStylesManager.shared.currentStyle

iOS/MasterFeed/MasterFeedViewController.swift

@@ -1167,7 +1167,7 @@ private extension MasterFeedViewController {
 				feed.rename(to: name) { result in
 					switch result {
 					case .success:
-						self?.reloadNode(node)
+						break
 					case .failure(let error):
 						self?.presentError(error)
 					}
@@ -1176,7 +1176,7 @@ private extension MasterFeedViewController {
 				folder.rename(to: name) { result in
 					switch result {
 					case .success:
-						self?.reloadNode(node)
+						break
 					case .failure(let error):
 						self?.presentError(error)
 					}

iOS/Resources/styleSheet.css

@@ -199,14 +199,12 @@ sub {
 	width: 100% !important;
 }
 
-@media (max-width: 420px) {
 blockquote {
 	margin-inline-start: 0;
 	margin-inline-end: 0;
 	padding-left: 15px;
 	border-left: 3px solid var(--secondary-accent-color);
 }
-}
 
 /* Feed Specific */
 

iOS/UIKit Extensions/InteractiveNavigationController.swift

@@ -51,6 +51,7 @@ private extension InteractiveNavigationController {
 		navigationAppearance.titleTextAttributes = [.foregroundColor: UIColor.label]
 		navigationAppearance.largeTitleTextAttributes = [.foregroundColor: UIColor.label]
 		navigationBar.standardAppearance = navigationAppearance
+		navigationBar.scrollEdgeAppearance = navigationAppearance
 		navigationBar.tintColor = AppAssets.primaryAccentColor
 		
 		let toolbarAppearance = UIToolbarAppearance()