From 0f2cf42cebe839f10ce9f836498af771bd763353 Mon Sep 17 00:00:00 2001 From: Priansh Shah Date: Tue, 24 Apr 2018 23:05:40 +0300 Subject: [PATCH] revert changelog --- README.md | 3 +++ app/views/form.server.view.pug | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ccc824c1..b269cf7a 100755 --- a/README.md +++ b/README.md @@ -15,8 +15,11 @@ Below you will find a changelog. (newest to oldest) +<<<<<<< HEAD <<<<<<< HEAD - fix responsiveness and mobile design +======= +>>>>>>> parent of 2835280f... fix mobile responsiveness - fix form styling so it isn't terrible (use Raleway, change bg color) ======= >>>>>>> parent of 7afc7eef... update changelog diff --git a/app/views/form.server.view.pug b/app/views/form.server.view.pug index f27809f9..d74a3897 100644 --- a/app/views/form.server.view.pug +++ b/app/views/form.server.view.pug @@ -43,15 +43,12 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') } label.btn-default { font-size: 14pt !important; - width: 6em !important; + width: 10% !important; padding-right: 30px; background: none !important; color: rgba(0,0,0,0.3) !important; border-color: rgba(0,0,0,0.3) !important; } - .field-directive { - margin-right: 10px !important; margin-left: 10px !important; - } label.btn-default:hover, label.btn-default:visited, label.btn-default:active { color: #000 !important; background: none !important;