diff options
| -rw-r--r-- | static/style.css | 20 | ||||
| -rw-r--r-- | templates/main/base.html | 85 | 
2 files changed, 63 insertions, 42 deletions
| diff --git a/static/style.css b/static/style.css index 51f3c8da..418ce8fa 100644 --- a/static/style.css +++ b/static/style.css @@ -1,3 +1,17 @@ +html { +    height: 100%; +} + +body { +    display: flex; +    flex-direction: column; +    height: 100%; +} + +.uk-offcanvas-content { +    flex: 1 0 auto; +} +  .uk-background-secondary .uk-navbar-dropdown-nav .uk-active a {      color: white !important;  } @@ -74,10 +88,14 @@ img.uk-border-rounded {      border: 1px #25292f solid;  } +footer { +    flex-shrink: 0; +} +  footer div.uk-section {      padding: 0 0 0 0;  }  footer div.uk-section div.uk-text-center {      margin-top: 20px; -}
\ No newline at end of file +} diff --git a/templates/main/base.html b/templates/main/base.html index deeb2899..2a1a1481 100644 --- a/templates/main/base.html +++ b/templates/main/base.html @@ -1,48 +1,51 @@  <!DOCTYPE html>  <html lang="en"> -<head> -    {% block head %} -        <title>Python Discord | {% block title %}{% endblock %}</title> -        <meta charset="UTF-8"> -        <meta name="viewport" content="width=device-width, initial-scale=1"> -        <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script> -        <script defer src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-beta.39/js/uikit.min.js"></script> -        <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}"> -        <link rel="stylesheet" href="/static/uikit_blurple.css"/> -        <link rel="stylesheet" href="/static/style.css"/> +    <head> +        {% block head %} +            <title>Python Discord | {% block title %}{% endblock %}</title> +            <meta charset="UTF-8"> +            <meta name="viewport" content="width=device-width, initial-scale=1"> +            <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script> +            <script defer src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-beta.39/js/uikit.min.js"></script> +            <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}"> +            <link rel="stylesheet" href="/static/uikit_blurple.css"/> +            <link rel="stylesheet" href="/static/style.css"/> -        <!-- OpenGraph metadata --> -        <meta property="og:title" content="Python Discord | {% block og_title %}{% endblock %}"> -        <meta property="og:description" content="{% block og_description %}We're a large, friendly community focused around the Python programming language. Our community is open to those who wish to learn the language, as well as those looking to help others.{% endblock %}"> -        <meta content="/static/logos/logo_discord.png" property="og:image"> -    {% endblock %} -    {% block extra_head %} +            <!-- OpenGraph metadata --> +            <meta property="og:title" content="Python Discord | {% block og_title %}{% endblock %}"> +            <meta property="og:description" content="{% block og_description %}We're a large, friendly community focused around the Python programming language. Our community is open to those who wish to learn the language, as well as those looking to help others.{% endblock %}"> +            <meta content="/static/logos/logo_discord.png" property="og:image"> +        {% endblock %} +        {% block extra_head %} -    {% endblock %} -</head> -<body class="page-{{ current_page }}"> -{% include "main/navigation.html" %} -{% if current_page != "index" %} -    {% block beta_error %} -        <div class="uk-container uk-section" style="padding-top: 10px; padding-bottom: 10px;"> -            <div class="uk-container uk-container-small"> -                <div class="uk-alert-danger" uk-alert> -                    <p> -                        Please note: this site is under construction. What you see now may be vastly different -                        from the final project state. Feel free to chat to us on Discord if you're curious! -                    </p> +        {% endblock %} +    </head> +    <body class="page-{{ current_page }}"> +        <div class="uk-offcanvas-content"> +            {% include "main/navigation.html" %} +            {% if current_page != "index" %} +                {% block beta_error %} +                    <div class="uk-container uk-section" style="padding-top: 10px; padding-bottom: 10px;"> +                        <div class="uk-container uk-container-small"> +                            <div class="uk-alert-danger" uk-alert> +                                <p> +                                    Please note: this site is under construction. What you see now may be vastly different +                                    from the final project state. Feel free to chat to us on Discord if you're curious! +                                </p> +                            </div> +                        </div> +                    </div> +                {% endblock %} +            {% endif %} +            {% block content %}{% endblock %} +        </div> + +        <footer> +            <div class="uk-section uk-section-secondary uk-container-medium uk-text-meta"> +                <div class="uk-text-center"> +                    <p>This website uses <a href="https://python.org">Python</a> and <a href="http://flask.pocoo.org/">Flask</a>, and was developed collaboratively on <a href="https://github.com/discord-python/site">GitHub</a>.</p>                  </div>              </div> -        </div> -    {% endblock %} -{% endif %} -{% block content %}{% endblock %} -<footer> -<div class="uk-section uk-section-secondary uk-container-medium uk-text-meta"> -    <div class="uk-text-center"> -        <p>This website uses <a href="https://python.org">Python</a> and <a href="http://flask.pocoo.org/">Flask</a>, and was developed collaboratively on <a href="https://github.com/discord-python/site">GitHub</a>.</p> -    </div> -</div> -</footer> -</body> +        </footer> +    </body>  </html> | 
