From 05df416dbd184d3e94951fbe3b5851fd9e055125 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 29 Mar 2021 17:52:19 -0700
Subject: [PATCH] Bootstrap 5 tweaks

---
 e107_themes/bootstrap5/style.css  |  1 +
 e107_themes/bootstrap5/theme.html |  2 +-
 e107_themes/bootstrap5/theme.php  | 27 +++------------------------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/e107_themes/bootstrap5/style.css b/e107_themes/bootstrap5/style.css
index 27c3a037f..ed8929333 100644
--- a/e107_themes/bootstrap5/style.css
+++ b/e107_themes/bootstrap5/style.css
@@ -102,6 +102,7 @@ ul.social-buttons li a {
 
 /* */
 .jumbotron {
+  margin-top: 60px;
   padding: 2rem 1rem;
   margin-bottom: 2rem;
   background-color: #e9ecef;
diff --git a/e107_themes/bootstrap5/theme.html b/e107_themes/bootstrap5/theme.html
index db8a31612..e5ae93a66 100644
--- a/e107_themes/bootstrap5/theme.html
+++ b/e107_themes/bootstrap5/theme.html
@@ -48,7 +48,7 @@
 		<hr>
 		<div class="container">{NAVIGATION: type=main&layout=footer}</div>
 		<div class="container">
-			<p class="m-0 text-center text-white">{SITEDISCLAIMER}</p>
+			<p class="mt-5 mb-0 text-center text-white">{SITEDISCLAIMER}</p>
 		</div>
 	<!-- /.container -->
 	</div>
diff --git a/e107_themes/bootstrap5/theme.php b/e107_themes/bootstrap5/theme.php
index d232bd9d3..671a31ed3 100644
--- a/e107_themes/bootstrap5/theme.php
+++ b/e107_themes/bootstrap5/theme.php
@@ -20,39 +20,18 @@ if(!defined('e107_INIT'))
 
             //e107::meta('apple-mobile-web-app-capable','yes');
 
-
-            $bootswatch = e107::pref('theme', 'bootswatch', false);
-            if($bootswatch) {
+            if($bootswatch = e107::pref('theme', 'bootswatch', false))
+            {
                 e107::css('url', 'https://bootswatch.com/4/' . $bootswatch . '/bootstrap.min.css');
                 e107::css('url', 'https://bootswatch.com/4/' . $bootswatch . '/bootstrap.min.css');
             }
 
-            $inlinecss = e107::pref('theme', 'inlinecss', false);
-            if($inlinecss)
-            {
-                e107::css("inline", $inlinecss);
-            }
-            $inlinejs = e107::pref('theme', 'inlinejs');
-            if($inlinejs)
-            {
-                e107::js("footer-inline", $inlinejs);
-            }
-
-            e107::js("theme", 'custom.js', 'jquery');
-
             $login_iframe  = e107::pref('theme', 'login_iframe', false);
 
-            //XXX FIXME - e_IFRAME cannot be redefined.
-            if (THEME_LAYOUT == "singlelogin" && $login_iframe)
+            if(THEME_LAYOUT === "splash" && $login_iframe)
             {
                 define('e_IFRAME', '0');
             }
-            if (THEME_LAYOUT == "singlesignup" && $login_iframe)
-            {
-                define('e_IFRAME', '0');
-            }
-
-
 
         }