diff --git a/manage.py b/manage.py old mode 100644 new mode 100755 diff --git a/notes/templates/notes/meeting.html b/notes/templates/notes/meeting.html index 886fdf7..7445b06 100644 --- a/notes/templates/notes/meeting.html +++ b/notes/templates/notes/meeting.html @@ -5,7 +5,7 @@ {% endblock css %} {% block content %} -
+
{{html|safe}}
{% endblock content %} \ No newline at end of file diff --git a/notes/templates/notes/test.html b/notes/templates/notes/test.html index 6db2367..0f33fc2 100644 --- a/notes/templates/notes/test.html +++ b/notes/templates/notes/test.html @@ -4,7 +4,7 @@ {% endblock css %} {% block content %} -
+
{{html|safe}}
{% endblock content %} \ No newline at end of file diff --git a/pages/static/pages/css/styles.css b/pages/static/pages/css/styles.css index c37c218..d44d71c 100644 --- a/pages/static/pages/css/styles.css +++ b/pages/static/pages/css/styles.css @@ -1,14 +1,14 @@ -<<<<<<< HEAD @import 'https://fonts.googleapis.com/css?family=Montserrat:300,400,500'; @import 'https://fonts.googleapis.com/css?family=Josefin+Slab:700'; @import 'https://fonts.googleapis.com/css?family=Arapey:400,600'; @import url('https://fonts.googleapis.com/css2?family=Hind:wght@300&display=swap'); .jumbotron { - background-image: url('img/hero.png'); - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; + position: absolute; + top: 0; + left: 0; + height: 100vh; + width: 100vw; + background-image: url('img/hero.png') } .valign { display: flex; diff --git a/pages/templates/pages/base.html b/pages/templates/pages/base.html index d8fae87..1fdb3b2 100644 --- a/pages/templates/pages/base.html +++ b/pages/templates/pages/base.html @@ -19,8 +19,8 @@

You are using an outdated browser. Please upgrade your browser to improve your experience.

-