move css into custom

diff --git a/2020/assets/css/bootstrap.css b/2020/assets/css/bootstrap.css
index f9cac6a58f34cb28de9a7ef0c9b92b4187e6d865..680e7687862ea56dbd8f7717b23eeacc6e0de78c 100644 (file)
--- 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 2cfb15e75631ae9c0e30510a9fcab964b445daf5..1da22a1c9fff1fe0aa02bcf34c072ae32f941ce5 100644 (file)
--- 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;