diff --git a/app/config/contributors.yaml b/app/config/contributors.yaml index d26cdd366..2a47673ca 100755 --- a/app/config/contributors.yaml +++ b/app/config/contributors.yaml @@ -59,4 +59,7 @@ contributors: - name: "Oluwagbayi Makinde" username: "makindeo" year: 2024 + - name: "Bhushan Sah " + username: "sahb" + year: 2029 \ No newline at end of file diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index 95fb3d287..c66e6a6c0 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -10,4 +10,4 @@ class PositionHistory(baseModel): Department = ForeignKeyField(Department) class Meta: - primary_key = CompositeKey('positioncode', 'revisiondate', 'status') \ No newline at end of file + primary_key = CompositeKey('positioncode', 'revisiondate', 'status') diff --git a/app/static/css/base.css b/app/static/css/base.css index 940f8d6e5..c36018a3a 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -192,6 +192,31 @@ a { z-index:999; } +.site-footer { + position: fixed; + left: 280px; + right: 0; + bottom: 0; + + background-color: #e9ebec; + color: #1e2433; + + padding: 8px 15px; + line-height: 1.4; + box-sizing: border-box; + z-index: 101; + +} + +.sidebar-push { + padding-bottom: 85px; +} + +@media (max-width: 991px) { + .site-footer { + left: 0; + width: 100%; + } .card { position: relative; display: -webkit-box; diff --git a/app/static/css/contributors.css b/app/static/css/contributors.css index 0fe0601b0..2f54c122e 100755 --- a/app/static/css/contributors.css +++ b/app/static/css/contributors.css @@ -3,7 +3,6 @@ color: #ffffff; padding: 7px 30px; margin-top: 100px; - margin-right: 250px; } .container { top: -75px; diff --git a/app/templates/base.html b/app/templates/base.html index 4d6c2a79f..4b9825368 100755 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -66,10 +66,20 @@
{% block footer %} - -{% endblock %} + +{% endblock %} {% endblock %} diff --git a/app/templates/main/contributors.html b/app/templates/main/contributors.html index ffdfe4391..af33209dc 100755 --- a/app/templates/main/contributors.html +++ b/app/templates/main/contributors.html @@ -23,9 +23,9 @@

Contributors

{% endfor %} -
- -
+
+
+
diff --git a/database/demo_data.py b/database/demo_data.py index 4f3a5e72c..f8522b616 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -869,4 +869,4 @@ }, ] -PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() \ No newline at end of file +PositionHistory.insert_many(positionhistory).on_conflict_replace().execute()