From af0d2a8b88f69bd476c45dbe30d4cfc483582620 Mon Sep 17 00:00:00 2001 From: Anh Pham Date: Mar 19 2019 00:51:30 +0000 Subject: [PATCH 1/2] Made the footer consistent across all pages and stick to the bottom regardless of the length of the page's content --- diff --git a/assets/bootstrap/css/bootstrap.css b/assets/bootstrap/css/bootstrap.css index 7f36651..ce76dc7 100644 --- a/assets/bootstrap/css/bootstrap.css +++ b/assets/bootstrap/css/bootstrap.css @@ -2083,6 +2083,7 @@ fieldset[disabled] .btn-default.active { color: #fff; background-color: #428bca; border-color: #357ebd; + margin-bottom: 35px; } .btn-primary:hover, .btn-primary:focus, diff --git a/assets/css/custom.css b/assets/css/custom.css index ae27b8a..6641769 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -66,12 +66,16 @@ footer { text-align: center; padding:0 7vw; background-color: #3c6eb421; + bottom: 0; + position: absolute; + width: 100%; } fieldset { margin-top: 1em; } + fieldset legend { font-family: 'Montserrat'; font-style: italic; @@ -178,6 +182,10 @@ blockquote { main { margin-left: 25%; + min-height: 100vh; + overflow: hidden; + position: relative; + padding-bottom: 300px; } main .container { diff --git a/templates/messaging/message_sender_confirmation_sent.html b/templates/messaging/message_sender_confirmation_sent.html index fe259b5..57bb6b4 100644 --- a/templates/messaging/message_sender_confirmation_sent.html +++ b/templates/messaging/message_sender_confirmation_sent.html @@ -15,6 +15,10 @@ Tweet #WeAreFedora - {% block footer %}{% endblock %} + {% endblock content %} + +{% block footer %} + {% include "follow.html" %} +{% endblock %} diff --git a/templates/messaging/start.html b/templates/messaging/start.html index f0562c5..adcec41 100644 --- a/templates/messaging/start.html +++ b/templates/messaging/start.html @@ -52,3 +52,4 @@

{% endblock content %} + From 0033426e46366a3de4caed1274908e8a647daeb9 Mon Sep 17 00:00:00 2001 From: Anh Pham Date: Mar 19 2019 00:51:30 +0000 Subject: [PATCH 2/2] Updated solving issue 134: deleted Bootstrap change and made some css changes to fit mobile view --- diff --git a/assets/bootstrap/css/bootstrap.css b/assets/bootstrap/css/bootstrap.css index ce76dc7..7f36651 100644 --- a/assets/bootstrap/css/bootstrap.css +++ b/assets/bootstrap/css/bootstrap.css @@ -2083,7 +2083,6 @@ fieldset[disabled] .btn-default.active { color: #fff; background-color: #428bca; border-color: #357ebd; - margin-bottom: 35px; } .btn-primary:hover, .btn-primary:focus, diff --git a/assets/css/custom.css b/assets/css/custom.css index 6641769..d1274b0 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -3,10 +3,20 @@ --secondary-color: #294172; } +*{ + box-sizing: border-box; +} + +*:before, *:after{ + box-sizing: border-box; +} + body { font-family: 'Open Sans'; line-height: 1.8em; font-size: 16px; + height: 100%; + position: relative; } h1, h2, h3, h4, h5, h6 { @@ -71,6 +81,14 @@ footer { width: 100%; } +main{ + min-height: 100vh; + display: block; + overflow: hidden; + position: relative; + padding-bottom: 300px; +} + fieldset { margin-top: 1em; } @@ -180,12 +198,9 @@ blockquote { max-height: 300px; } - main { + main{ margin-left: 25%; - min-height: 100vh; - overflow: hidden; - position: relative; - padding-bottom: 300px; + width: 90%; } main .container { @@ -217,6 +232,11 @@ blockquote { blockquote { min-height: 170px; } + + main{ + margin-left: 25%; + width: 100%; + } } .emoji {