From 75e8fb06b42420f21c8571341ef8300a102cd2c7 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Thu, 2 Jan 2020 16:18:59 +0530
Subject: Resolve conflicts

---
 yaksh/static/yaksh/css/custom.css | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'yaksh/static')

diff --git a/yaksh/static/yaksh/css/custom.css b/yaksh/static/yaksh/css/custom.css
index d0d5c82..55d5d6d 100644
--- a/yaksh/static/yaksh/css/custom.css
+++ b/yaksh/static/yaksh/css/custom.css
@@ -24,6 +24,15 @@ body, .dropdown-menu {
     font-size: 1.25rem;
 }
 
+.base-content {
+    padding-top: 5em;
+    padding-bottom: 5em;
+}
+
 #login-btn, #signup-btn, #forgot-btn{
     width: 75%;
 }
+
+.dropdown {
+    display: flex;
+}
-- 
cgit