From b68a7d3ff77dc4422743b173200cd4568c3d054b Mon Sep 17 00:00:00 2001
From: Greg Farough <gregf@fsf.org>
Date: Tue, 24 Sep 2019 11:27:20 -0400
Subject: [PATCH] move css into custom

---
 2020/assets/css/bootstrap.css | 4 ----
 2020/assets/css/custom.css    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/2020/assets/css/bootstrap.css b/2020/assets/css/bootstrap.css
index f9cac6a5..680e7687 100644
--- a/2020/assets/css/bootstrap.css
+++ b/2020/assets/css/bootstrap.css
@@ -4321,11 +4321,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 }
 .navbar-brand {
   float: left;
-<<<<<<< HEAD
   height: 50px;
-=======
-  height: 86px;
->>>>>>> parent of 5a985e3... 86 pix
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
diff --git a/2020/assets/css/custom.css b/2020/assets/css/custom.css
index 2cfb15e7..1da22a1c 100644
--- a/2020/assets/css/custom.css
+++ b/2020/assets/css/custom.css
@@ -822,7 +822,7 @@ hr {
 .navbar-brand {
     float: left;
     font-size: 18px;
-    height: 60px;
+    height: 86px;
     line-height: 20px;
     margin-bottom: 9px;
     padding: 15px;
-- 
2.25.1