- BookmarkSetupViewController

	- limit logo height to better fit screen height
	- no longer show logo when adding additional accounts to make up for the lost space due to the UINavigationBar being included, to work across all screen heights

ownCloud/Bookmarks/BookmarkViewController.swift

@@ -1154,6 +1154,7 @@ extension BookmarkViewController {
 			setupViewController.navigationItem.titleLabelText = "Add account".localized
 
 			let navigationViewController = ThemeNavigationController(rootViewController: setupViewController)
+			navigationViewController.modalPresentationStyle = .fullScreen
 			hostViewController.present(navigationViewController, animated: true, completion: nil)
 		}
 	}

ownCloud/Bookmarks/Setup/BookmarkSetupViewController.swift

@@ -51,7 +51,6 @@ class BookmarkSetupViewController: EmbeddingViewController, BookmarkComposerDele
 
 	override func loadView() {
 		let contentView = UIView()
-		contentView.translatesAutoresizingMaskIntoConstraints = false
 
 		visibleContentContainerView.translatesAutoresizingMaskIntoConstraints = false
 
@@ -66,8 +65,12 @@ class BookmarkSetupViewController: EmbeddingViewController, BookmarkComposerDele
 		self.cssSelectors = [.modal, .accountSetup]
 
 		// Add logo
-		let maxLogoSize = CGSize(width: 256, height: 128)
-		logoView = BrandView(showBackground: false, showLogo: true, logoMaxSize: maxLogoSize, fitToLogo: true, roundedCorners: false, assetSuffix: .setup)
+		if navigationController == nil {
+			let deviceScreenHeight = UIScreen.main.bounds.height
+			let logoMaxHeight = deviceScreenHeight < 800 ? (deviceScreenHeight < 600 ? 48 : 96) : 128
+			let maxLogoSize = CGSize(width: 256, height: logoMaxHeight)
+			logoView = BrandView(showBackground: false, showLogo: true, logoMaxSize: maxLogoSize, fitToLogo: true, roundedCorners: false, assetSuffix: .setup)
+		}
 
 		if let logoView {
 			contentView.addSubview(logoView)