From: m712 <redacted>
Date: Tue, 23 Feb 2016 11:35:23 +0000 (+0200)
Subject: Minor fixes
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/6be597830053c7086e83f103fd073b1f8212a9fe?hp=76fe2571937371940ac0e6a9e43561bbe25dafc5

Minor fixes
---

diff --git a/css/mock1.css b/css/mock1.css
index 6bd61bef5..a6ec32bdc 100644
--- a/css/mock1.css
+++ b/css/mock1.css
@@ -78,7 +78,7 @@ a {
 .container {
     padding: 50px 0 0;
     width: 100%;
-    min-height: 70vh;
+    min-height: 68vh;
 }
 
 .main {
@@ -229,6 +229,10 @@ a.hchild:hover,a.hchild:active {
 .footer {
     background: var(--jumbotron-bg);
     color: rgba(var(--footer-text-color),.9);
+<<<<<<< HEAD
+    margin-top: 2vh;
+=======
+>>>>>>> 76fe2571937371940ac0e6a9e43561bbe25dafc5
     display: flex;
     flex-wrap: nowrap;
     min-height: 27vh;
@@ -245,6 +249,11 @@ a.hchild:hover,a.hchild:active {
     color: #000;
 }
 
+.footer h2 {
+    margin-bottom: 9px;
+    display: inline-block;
+}
+
 .footerchild ul,
 .footerchild ul ul {
     margin-left: 10px;
@@ -314,4 +323,4 @@ a.copyright {
     .copyright a img {
         height: 5vh;
     }
-}
\ No newline at end of file
+}