diff options
| author |  Gareth Coles <[email protected]> | 2018-06-05 16:07:35 +0100 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2018-06-05 16:07:35 +0100 |
| commit | 13a3c1e29473aa9f563e8db4ad94cb3eee9bdfe6 (patch) | |
| tree | 290c6d668ec9161a39065456a33ec634215907cc /templates | |
| parent | documentation metadata API (#57) (diff) | |
Move from CSS to SCSS (#86)
* Rewrite existing style.css with sass
* Add "uses-rst" class for pages that use rendered RST
This replaces the previous method of just listing
every page in the sass
* Remove old debug print
* Mixins and error pages
* Newly built CSS
* Add SASS cache to .gitignore
* New error SASS
* Slight changes to error template
* Add UIKit SCSS to repo
This includes the LICENSE and our customizations, which
makes life way easier for contributors
* Reorganize sass folder; your watchers can avoid uikit now
* Sass folder should be called scss
* Change variable names
* [SCSS] Linting
* Fix scss_lint gem name [ci skip]
* [SCSS] Now you can compile with just Python!
* Temporary hack to make the wiki editor taller
* [SCSS] @jchristgit
* [SCSS.py] Require specification of include dir to simplify the SCSS imports
* [SCSS] All inline styles have been removed
* [SCSS] Update UIKit theme to import from our variables
* [SCSS] Remove extra newlines in errors/_common.scss
Diffstat (limited to 'templates')
26 files changed, 102 insertions, 84 deletions
diff --git a/templates/errors/error.html b/templates/errors/error.html index 366bd49e..6132aea1 100644 --- a/templates/errors/error.html +++ b/templates/errors/error.html @@ -2,11 +2,8 @@ {% block title %}Error {{ code }}{% endblock %} {% block og_title %}Error {{ code }}{% endblock %} {% block og_description %}{{ error_message | safe }}{% endblock %} -{% block beta_error %}{% endblock %} {% block extra_head %} - <link href="{{ static_file('css/window.css') }}" rel="stylesheet" type="text/css"/> - <script> window._RequestMethod = "{{ request.method.lower() }}"; window._Code = {{ code }}; @@ -22,7 +19,7 @@ <div class="uk-background-muted"> <div class="uk-container"> <div class="uk-section uk-text-center uk-panel uk-panel-box"> - <p style="color: #e84149; font-family: monospace;" class="error-header uk-text-large uk-text-break">{{ error_title }}</p> + <p class="error-header uk-text-large uk-text-break">{{ error_title }}</p> </div> </div> </div> @@ -32,20 +29,16 @@ <div class="window" id="win"> <div class="top"> <div class="panel"> - <span class="first" id="terminal-close"></span> - <span class="second"></span> - <span class="third"></span> + <span id="terminal-close"></span> + <span id="second-button"></span> + <span id="third-button"></span> </div> - <div class="nav"> - <span class="prev active"><i class="fa fa-angle-left"></i></span> - <span class="next"><i class="fa fa-angle-right"></i></span> - </div> </div> <div class="inside"> - <div class="blok"> - <pre id="terminal"><code style="white-space: pre-wrap;" class="python" id="error"></code></pre> + <div class="block"> + <pre id="terminal"><code class="python" id="error"></code></pre> </div> </div> </div> @@ -61,4 +54,5 @@ <h1>There was an issue processing your request</h1> <p>{{ error_message | safe }}</p> </noscript> -{% endblock %}
\ No newline at end of file +{% endblock %} + diff --git a/templates/main/about/privacy.html b/templates/main/about/privacy.html index ce6e20f8..ebf3eebd 100644 --- a/templates/main/about/privacy.html +++ b/templates/main/about/privacy.html @@ -31,12 +31,12 @@ <h3>Data collection</h3> - <table class="uk-table uk-table-divider uk-table-striped uk-table-small table-bordered"> + <table class="uk-table uk-table-divider uk-table-striped uk-table-small table-bordered" id="data-collection-table"> <thead> <tr class="thick-bottom-border"> <th>What we collect</th> <th class="uk-table-shrink">When</th> - <th style="max-width: 30rem;">What it's used for</th> + <th>What it's used for</th> <th>Who can access it</th> </tr> </thead> @@ -44,25 +44,25 @@ <tr> <td>Discord user ID</td> <td class="uk-table-shrink"><strong>self.accept()</strong> run on Discord</td> - <td style="max-width: 30rem;">Statistics, data association (infractions, code jam applications, etc)</td> + <td>Statistics, data association (infractions, code jam applications, etc)</td> <td>Administrative staff</td> </tr> <tr> <td>Discord username and discriminator</td> <td class="uk-table-shrink"><strong>self.accept()</strong> run on Discord</td> - <td style="max-width: 30rem;">Display purposes (alongside ID in staff areas, public profiles)</td> + <td>Display purposes (alongside ID in staff areas, public profiles)</td> <td>Public, for code jam team listings and winner info</td> </tr> <tr> <td>Assigned roles on Discord</td> <td class="uk-table-shrink"><strong>self.accept()</strong> run on Discord</td> - <td style="max-width: 30rem;">Access control for the site</td> + <td>Access control for the site</td> <td>Administrative staff</td> </tr> <tr class="thick-bottom-border"> <td>Messages sent on Discord</td> <td class="uk-table-shrink"><strong>self.accept()</strong> run on Discord</td> - <td style="max-width: 30rem;"> + <td> Stored in memory by the bot for processing temporarily, no message content reaches the database unless you're using a bot command that interfaces with the site - May be temporarily written to a log file for debugging purposes @@ -73,20 +73,20 @@ <tr class="thick-bottom-border"> <td>OAuth access and refresh token</td> <td class="uk-table-shrink">Discord login on site</td> - <td style="max-width: 30rem;">Used to find your Discord user ID when you log in</td> + <td>Used to find your Discord user ID when you log in</td> <td>Administrative staff</td> </tr> <tr> <td>GitHub username</td> <td class="uk-table-shrink">Code jam profile</td> - <td style="max-width: 30rem;">Used to identify you on GitHub as part of a code jam team</td> + <td>Used to identify you on GitHub as part of a code jam team</td> <td>Public, for code jam team listings</td> </tr> <tr> <td>Timezone</td> <td class="uk-table-shrink">Code jam profile</td> - <td style="max-width: 30rem;">A factor in code jam team match-ups</td> + <td>A factor in code jam team match-ups</td> <td>Administrative staff</td> </tr> </tbody> diff --git a/templates/main/base.html b/templates/main/base.html index 8893be01..2a3f295c 100644 --- a/templates/main/base.html +++ b/templates/main/base.html @@ -15,9 +15,9 @@ <!-- Stylesheets --> <link rel="shortcut icon" href="{{ static_file('favicon.ico') }}"> - <link rel="stylesheet" href="{{ static_file('uikit_blurple.css') }}"/> - <link rel="stylesheet" href="{{ static_file('style.css') }}"/> - <link rel="stylesheet" href="{{ static_file('css/pygments-monokai.css') }}"/> + <link rel="stylesheet" href="{{ static_file('css/uikit_blurple.css') }}"/> + <link rel="stylesheet" href="{{ static_file('css/style.css') }}"/> + <link rel="stylesheet" href="{{ static_file('css/bundled/pygments-monokai.css') }}"/> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css"> <!-- OpenGraph metadata --> @@ -29,7 +29,9 @@ {% endblock %} </head> - <body class="page-{{ current_page.replace(".", "-") }}"> + <body class="{% block page_classes %}{% endblock page_classes %} + page-{{ current_page.replace(".", "-") }} + blueprint-{{ blueprint.replace(".", "-") }}"> {% if current_page == "main.index" %} <div class="uk-offcanvas-content uk-section-primary"> {% else %} diff --git a/templates/main/index.html b/templates/main/index.html index 06d29aba..c2d81a43 100644 --- a/templates/main/index.html +++ b/templates/main/index.html @@ -18,7 +18,7 @@ on a complex project, we've got someone who can help you if you get stuck. </p> <div class="uk-container uk-align-center"> - <a href="{{ url_for('main.invite') }}" class="uk-button uk-button-large uk-button-darkish" style="padding: 0;"> + <a href="{{ url_for('main.invite') }}" class="uk-button uk-button-large uk-button-darkish" id="invite-button"> <img src="https://discordapp.com/api/guilds/267624335836053506/embed.png?style=banner3"> </a> </div> diff --git a/templates/main/info/resources.html b/templates/main/info/resources.html index ae416d33..f3f4d0c0 100644 --- a/templates/main/info/resources.html +++ b/templates/main/info/resources.html @@ -75,16 +75,17 @@ {% endif %} {% if data["payment_description"] %} - <img class="uk-float-left" style="height: 3.7rem; vertical-align: text-bottom; margin-right: 0.5rem;" uk-tooltip="{{ data["payment_description"] }}" src="{{ file_path }}" /> + <img class="uk-float-left payment-description" uk-tooltip="{{ data["payment_description"] }}" src="{{ file_path }}" /> {% else %} - <img class="uk-float-left" style="height: 3.7rem; vertical-align: text-bottom; margin-right: 0.5rem;" uk-tooltip="{{ data["payment"].title() }}" src="{{ file_path }}" /> + <img class="uk-float-left payment-description" uk-tooltip="{{ data["payment"].title() }}" src="{{ file_path }}" /> {% endif %} - <div style="margin-bottom: -1rem;"> + + <div class="resource-title"> <strong>{{ item }}</strong> <br /> - <div class="uk-button-group" style="padding-bottom: 0;"> + <div class="uk-button-group"> {% for url in data.urls %} <a class="uk-button uk-button-default uk-button-small" - uk-tooltip="title: {{ url.title }}; pos: bottom" + uk-tooltip="title: {{ url.title }}; pos: bottom" href="{{ url.url }}"><i class="{{ url.classes }}"></i></a> {% endfor %} </div> diff --git a/templates/main/jams/index.html b/templates/main/jams/index.html index 5c2df182..e72e7e84 100644 --- a/templates/main/jams/index.html +++ b/templates/main/jams/index.html @@ -1,6 +1,7 @@ {% extends "main/base.html" %} {% block title %}Code Jams | Home{% endblock %} {% block og_title %}Code Jams | Home{% endblock %} +{% block page_classes %}uses-rst{% endblock %} {% block content %} <div class="uk-section"> <div class="uk-container uk-container-small"> @@ -39,7 +40,7 @@ </p> <a href="https://jetbrains.com"> - <img src="{{ static_file("images/jetbrains.png") }}" style="max-width: 15rem;" /> + <img src="{{ static_file("images/jetbrains.png") }}" class="sponsor-logo"/> </a> </figure> </div> @@ -85,7 +86,7 @@ {{ format_datetime(jam.date_start) }} UTC </span> - <span style="vertical-align: middle"> + <span class="date-separator"> <i class="uk-icon fa-fw far fa-arrow-right" ></i> </span> diff --git a/templates/main/jams/join.html b/templates/main/jams/join.html index 4bd4f2b0..4ff645b8 100644 --- a/templates/main/jams/join.html +++ b/templates/main/jams/join.html @@ -1,18 +1,19 @@ {% extends "main/base.html" %} {% block title %}Code Jams | Join{% endblock %} {% block og_title %}Code Jams | Join{% endblock %} +{% block page_classes %}uses-rst{% endblock %} {% macro show_question(question) %} <div id="div-{{ question.id }}"> <div class="uk-form-label"> {% if question.optional %} - <label class="uk-form-label" style="margin-top: 0" for="{{ question.id }}"> + <label class="uk-form-label question-label" for="{{ question.id }}"> <strong>{{ question.title }}</strong> <br /> <span class="uk-text-meta">You may skip this question</span> </label> {% else %} - <label class="uk-form-label" style="margin-top: 0" for="{{ question.id }}"> + <label class="uk-form-label question-label" for="{{ question.id }}"> <strong>{{ question.title }}</strong> <br /> <span class="uk-text-meta">This question is required</span> @@ -23,10 +24,10 @@ {% if question.type == "checkbox" %} {% if question.optional %} <input class="uk-checkbox" type="checkbox" name="{{ question.id }}" id="{{ question.id }}"> - <label for="{{ question.id }}" style="padding-left: 0.7rem;">Confirm</label> + <label for="{{ question.id }}" class="checkbox-label">Confirm</label> {% else %} <input class="uk-checkbox" type="checkbox" name="{{ question.id }}" id="{{ question.id }}" required> - <label for="{{ question.id }}" style="padding-left: 0.7rem;">Confirm</label> + <label for="{{ question.id }}" class="checkbox-label">Confirm</label> {% endif %} {% elif question.type == "email" %} @@ -47,12 +48,12 @@ {% if question.optional %} {% for option in question.data.options %} <input class="uk-radio radio-{{ question.id }}" type="radio" name="{{ question.id }}" id="{{ question.id }}-{{ option }}" value="{{ option }}"> - <label style="padding-left: 0.7rem; padding-right: 1rem;" for="{{ question.id }}-{{ option }}">{{ option }}</label> + <label class="radio-label" for="{{ question.id }}-{{ option }}">{{ option }}</label> {% endfor %} {% else %} {% for option in question.data.options %} <input class="uk-radio radio-{{ question.id }}" type="radio" name="{{ question.id }}" id="{{ question.id }}-{{ option }}" value="{{ option }}" required> - <label style="padding-left: 0.7rem; padding-right: 1rem;" for="{{ question.id }}-{{ option }}">{{ option }}</label> + <label class="radio-label" for="{{ question.id }}-{{ option }}">{{ option }}</label> {% endfor %} {% endif %} @@ -62,14 +63,14 @@ {% for num in range(question.data.min, question.data.max + 1) %} <span> <input class="uk-radio radio-{{ question.id }}" type="radio" name="{{ question.id }}" id="{{ question.id }}-{{ num }}" value="{{ num }}"> - <label style="padding-left: 0.3rem;" for="{{ question.id }}-{{ num }}">{{ num }}</label> + <label class="range-label" for="{{ question.id }}-{{ num }}">{{ num }}</label> </span> {% endfor %} {% else %} {% for num in range(question.data.min, question.data.max + 1) %} <span> <input class="uk-radio radio-{{ question.id }}" type="radio" name="{{ question.id }}" id="{{ question.id }}-{{ num }}" value="{{ num }}" required> - <label style="padding-left: 0.3rem;" for="{{ question.id }}-{{ num }}">{{ num }}</label> + <label class="range-label" for="{{ question.id }}-{{ num }}">{{ num }}</label> </span> {% endfor %} {% endif %} @@ -84,14 +85,14 @@ {% elif question.type == "textarea" %} {% if question.optional %} - <textarea class="uk-input uk-textarea fira-code" name="{{ question.id }}" id="{{ question.id }}" style="resize: vertical; min-height: 15rem;"></textarea> + <textarea class="uk-input uk-textarea fira-code textarea" name="{{ question.id }}" id="{{ question.id }}"></textarea> {% else %} - <textarea class="uk-input uk-textarea fira-code" name="{{ question.id }}" id="{{ question.id }}" style="resize: vertical; min-height: 15rem;" required></textarea> + <textarea class="uk-input uk-textarea fira-code textarea" name="{{ question.id }}" id="{{ question.id }}" required></textarea> {% endif %} {% elif question.type == "slider" %} <div class="uk-flex uk-flex-between"> - <label class="uk-label" style="margin-right: 1rem;" for="{{ question.id }}" id="{{ question.id }}-slider-value">{{ question.data.min }}</label> + <label class="uk-label slider-label" for="{{ question.id }}" id="{{ question.id }}-slider-value">{{ question.data.min }}</label> <input class="uk-range range-slider" name="{{ question.id }}" id="{{ question.id }}" min="{{ question.data.min }}" max="{{ question.data.max }}" step="1" value="{{ question.data.min }}" type="range"> </div> diff --git a/templates/main/jams/profile.html b/templates/main/jams/profile.html index 98867c8a..ba37f810 100644 --- a/templates/main/jams/profile.html +++ b/templates/main/jams/profile.html @@ -66,7 +66,7 @@ <i class="uk-icon fa-fw fas fa-bomb"></i> Delete </a> {% else %} - <a class="uk-button uk-button-default uk-text-muted uk-link-muted" style="cursor: default !important" + <a class="uk-button uk-button-default uk-text-muted uk-link-muted cursor-default" uk-tooltip="title: You can't delete your profile because you haven't submitted one yet!; pos: bottom"> <i class="uk-icon fa-fw fas fa-bomb"></i> Delete </a> diff --git a/templates/main/navigation.html b/templates/main/navigation.html index 8aa52961..ea525d2f 100644 --- a/templates/main/navigation.html +++ b/templates/main/navigation.html @@ -38,7 +38,7 @@ <ul class="uk-navbar-nav"> <li> <a><i class="uk-icon fas fa-chevron-down"></i></a> - <div class="uk-navbar-dropdown uk-background-secondary" uk-dropdown="pos: bottom-right" style="overflow-y: auto;"> + <div class="uk-navbar-dropdown uk-background-secondary" uk-dropdown="pos: bottom-right"> <ul class="uk-nav uk-navbar-dropdown-nav"> <li class="uk-nav-header uk-hidden@m">Navigation</li> @@ -72,7 +72,7 @@ <li class="uk-active"><a href="{{ url_for('discord.login') }}"><i class="uk-icon fas fa-lock"></i> Login with Discord</a></li> {% endif %} {% else %} - <li class="uk-active"><a style="color: #7289DA !important"><i class="uk-icon fas fa-exclamation-triangle"></i> Debug mode</a></li> + <li class="uk-active"><a class="debug-mode-item"><i class="uk-icon fas fa-exclamation-triangle"></i> Debug mode</a></li> {% endif %} {% if current_page.startswith("main.info") %} diff --git a/templates/staff/jams/edit_basics.html b/templates/staff/jams/edit_basics.html index e9bc69e1..c6d9753f 100644 --- a/templates/staff/jams/edit_basics.html +++ b/templates/staff/jams/edit_basics.html @@ -2,6 +2,8 @@ {% block title %}Staff | Jams | Edit (Basics){% endblock %} {% block og_title %}Staff | Jams | Edit (Basics){% endblock %} {% block og_description %}Edit the basic info for a code jam{% endblock %} +{% block page_classes %}uses-rst{% endblock %} + {% block content %} <div class="uk-container uk-container-small uk-section"> <h1 class="uk-text-center">Code Jam: Edit (Basics)</h1> diff --git a/templates/staff/jams/edit_ending.html b/templates/staff/jams/edit_ending.html index 600ad6fc..7bde88ee 100644 --- a/templates/staff/jams/edit_ending.html +++ b/templates/staff/jams/edit_ending.html @@ -2,9 +2,12 @@ {% block title %}Staff | Jams | Edit (Ending Comments){% endblock %} {% block og_title %}Staff | Jams | Edit (Ending Comments){% endblock %} {% block og_description %}Edit the ending comments for a code jam{% endblock %} + +{% block page_classes %}uses-rst{% endblock %} {% block extra_head %} <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script> {% endblock %} + {% block content %} <div class="uk-container uk-container-small uk-section"> <h1 class="uk-text-center">Code Jam: Edit (Ending Comments)</h1> @@ -16,7 +19,7 @@ </div> <div class="uk-form-controls uk-form-controls-text"> - <div id="editor" class="uk-textarea" style="resize: vertical; min-height: 15rem;">{{ jam.end_rst }}</div> + <div id="editor" class="uk-textarea">{{ jam.end_rst }}</div> </div> <input type="hidden" name="end_rst" id="end_rst" value="{{ jam.end_rst }}" /> diff --git a/templates/staff/jams/edit_info.html b/templates/staff/jams/edit_info.html index 81a0a9ac..7fdc3c22 100644 --- a/templates/staff/jams/edit_info.html +++ b/templates/staff/jams/edit_info.html @@ -2,9 +2,12 @@ {% block title %}Staff | Jams | Edit (Info){% endblock %} {% block og_title %}Staff | Jams | Edit (Info){% endblock %} {% block og_description %}Edit the basic info for a code jam{% endblock %} + +{% block page_classes %}uses-rst{% endblock %} {% block extra_head %} <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script> {% endblock %} + {% block content %} <div class="uk-container uk-container-small uk-section"> <h1 class="uk-text-center">Code Jam: Edit (Info)</h1> @@ -44,7 +47,7 @@ </div> <div class="uk-form-controls uk-form-controls-text"> - <div id="info_editor" class="uk-textarea" style="resize: vertical; min-height: 15rem;">{{ jam.info_rst }}</div> + <div id="info_editor" class="uk-textarea editor">{{ jam.info_rst }}</div> </div> <input type="hidden" name="info_rst" id="info_rst" value="{{ jam.info_rst }}" /> @@ -65,7 +68,7 @@ </div> <div class="uk-form-controls uk-form-controls-text"> - <div id="task_editor" class="uk-textarea" style="resize: vertical; min-height: 15rem;">{{ jam.task_rst }}</div> + <div id="task_editor" class="uk-textarea editor">{{ jam.task_rst }}</div> </div> <input type="hidden" name="task_rst" id="task_rst" value="{{ jam.task_rst }}" /> diff --git a/templates/staff/jams/forms/preamble_edit.html b/templates/staff/jams/forms/preamble_edit.html index 6e3fec0d..4108481b 100644 --- a/templates/staff/jams/forms/preamble_edit.html +++ b/templates/staff/jams/forms/preamble_edit.html @@ -1,9 +1,12 @@ {% extends "main/base.html" %} {% block title %}Staff | Forms | Edit Preamble{% endblock %} {% block og_title %}Staff | Forms | Edit Preamble{% endblock %} + +{% block page_classes %}uses-rst{% endblock %} {% block extra_head %} <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script> {% endblock %} + {% block content %} <div class="uk-container uk-container-small uk-section"> <h1 class="uk-text-center">Form: Edit Preamble</h1> @@ -15,7 +18,7 @@ </div> <div class="uk-form-controls uk-form-controls-text"> - <div id="editor" class="uk-textarea" style="resize: vertical; min-height: 15rem;">{{ form.preamble_rst }}</div> + <div id="editor" class="uk-textarea">{{ form.preamble_rst }}</div> </div> <input type="hidden" name="preamble_rst" id="preamble_rst" value="{{ form.preamble_rst }}" /> diff --git a/templates/staff/jams/forms/questions_view.html b/templates/staff/jams/forms/questions_view.html index c9d5098c..bebdde40 100644 --- a/templates/staff/jams/forms/questions_view.html +++ b/templates/staff/jams/forms/questions_view.html @@ -49,8 +49,8 @@ {% for question in questions %} <tr id="row-{{ question.id }}"> <td class="uk-table-shrink"> - <button class="uk-button-small uk-button uk-button-danger delete-question-button" style="padding-left: 5px; padding-right: 5px;" data-question-id="{{ question.id }}"><i class="uk-icon fa-fw far fa-trash"></i></button> - <a href="{{ url_for("staff.jams.forms.questions.edit", question=question.id) }}" class="uk-button-small uk-button uk-button-primary edit-question-button" style="padding-left: 5px; padding-right: 5px;"><i class="uk-icon fa-fw far fa-pencil"></i></a> + <button class="uk-button-small uk-button uk-button-danger delete-question-button" data-question-id="{{ question.id }}"><i class="uk-icon fa-fw far fa-trash"></i></button> + <a href="{{ url_for("staff.jams.forms.questions.edit", question=question.id) }}" class="uk-button-small uk-button uk-button-primary edit-question-button"><i class="uk-icon fa-fw far fa-pencil"></i></a> </td> <td class="uk-text-truncate" title="{{ question.id }}">{{ question.id }}</td> <td class="uk-table-shrink"> @@ -579,8 +579,8 @@ const row = ` <td class="uk-table-shrink"> - <button class="uk-button-small uk-button uk-button-danger delete-question-button" style="padding-left: 5px; padding-right: 5px;" data-question-id="${question.id}"><i class="uk-icon fa-fw far fa-trash"></i></button> - <a href="${q_url}" class="uk-button-small uk-button uk-button-primary edit-question-button" style="padding-left: 5px; padding-right: 5px;"><i class="uk-icon fa-fw far fa-pencil"></i></a> + <button class="uk-button-small uk-button uk-button-danger delete-question-button" data-question-id="${question.id}"><i class="uk-icon fa-fw far fa-trash"></i></button> + <a href="${q_url}" class="uk-button-small uk-button uk-button-primary edit-question-button"><i class="uk-icon fa-fw far fa-pencil"></i></a> </td> <td class="uk-text-truncate" title="${question.id}">${question.id}</td> <td class="uk-table-shrink">${optional}</td> diff --git a/templates/staff/jams/forms/view.html b/templates/staff/jams/forms/view.html index 46474ae9..83ff1ae4 100644 --- a/templates/staff/jams/forms/view.html +++ b/templates/staff/jams/forms/view.html @@ -50,7 +50,7 @@ {% for question in questions %} <tr id="row-{{ question.id }}"> <td class="uk-table-shrink"> - <button class="uk-button-small uk-button uk-button-danger delete-question-button" style="padding-left: 5px; padding-right: 5px;" data-question-id="{{ question.id }}"><i class="uk-icon fa-fw far fa-times"></i></button> + <button class="uk-button-small uk-button uk-button-danger delete-question-button" data-question-id="{{ question.id }}"><i class="uk-icon fa-fw far fa-times"></i></button> </td> <td class="uk-text-truncate" title="{{ question.id }}">{{ question.id }}</td> <td class="uk-table-shrink"> @@ -742,7 +742,7 @@ const row = ` <td class="uk-table-shrink"> - <button class="uk-button-small uk-button uk-button-danger delete-question-button" style="padding-left: 5px; padding-right: 5px;" data-question-id="${question.id}"><i class="uk-icon fa-fw far fa-times"></i></button> + <button class="uk-button-small uk-button uk-button-danger delete-question-button" data-question-id="${question.id}"><i class="uk-icon fa-fw far fa-times"></i></button> </td> <td class="uk-text-truncate" title="${question.id}">${question.id}</td> <td class="uk-table-shrink">${optional}</td> diff --git a/templates/staff/jams/index.html b/templates/staff/jams/index.html index b5734b51..c38883c2 100644 --- a/templates/staff/jams/index.html +++ b/templates/staff/jams/index.html @@ -26,7 +26,7 @@ {% if jam.state == "planning" %} <i class="uk-icon uk-text-muted fa-fw far fa-edit state-{{ jam.number }}" title="State: Planning" id="state-{{ jam.number }}-planning"></i> {% else %} - <i class="uk-icon uk-text-muted fa-fw far fa-edit state-{{ jam.number }}" style="display: none;" title="State: Planning" id="state-{{ jam.number }}-planning"></i> + <i class="uk-icon uk-text-muted fa-fw far fa-edit state-{{ jam.number }}" hidden="hidden" title="State: Planning" id="state-{{ jam.number }}-planning"></i> {% endif %} {% if jam.state == "announced" %} diff --git a/templates/staff/jams/infractions/view.html b/templates/staff/jams/infractions/view.html index bb3cf0ce..00374632 100644 --- a/templates/staff/jams/infractions/view.html +++ b/templates/staff/jams/infractions/view.html @@ -46,7 +46,7 @@ {% for infraction in infractions %} <tr id="row-{{ infraction.id }}"> <td class="uk-table-shrink"> - <button class="uk-button-small uk-button uk-button-danger delete-infraction-button" style="padding-left: 5px; padding-right: 5px;" data-infraction-id="{{ infraction.id }}"><i class="uk-icon fa-fw far fa-trash"></i></button> + <button class="uk-button-small uk-button uk-button-danger delete-infraction-button" data-infraction-id="{{ infraction.id }}"><i class="uk-icon fa-fw far fa-trash"></i></button> </td> <td class="uk-text-truncate" title="{{ infraction.id }}">{{ infraction.id }}</td> <td class="uk-table-shrink"> @@ -316,7 +316,7 @@ } const row = ` <td class="uk-table-shrink"> - <button class="uk-button-small uk-button uk-button-danger delete-infraction-button" style="padding-left: 5px; padding-right: 5px;" data-infraction-id="${infraction.id}"><i class="uk-icon fa-fw far fa-trash"></i></button> + <button class="uk-button-small uk-button uk-button-danger delete-infraction-button" data-infraction-id="${infraction.id}"><i class="uk-icon fa-fw far fa-trash"></i></button> </td> <td class="uk-text-truncate" title="${infraction.id}">${infraction.id}</td> <td class="uk-table-shrink"><code>${participant}</code></td> diff --git a/templates/staff/tables/edit.html b/templates/staff/tables/edit.html index 7b027884..0c6492e5 100644 --- a/templates/staff/tables/edit.html +++ b/templates/staff/tables/edit.html @@ -14,14 +14,14 @@ {% endif %} <form uk-grid class="uk-grid-small" action="{{ url_for("staff.tables.edit", table=table) }}" method="post"> <div class="uk-width-expand"> - <p>Primary key: <strong>"<span style="font-family: monospace">{{ primary_key }}</span>"</strong></p> + <p>Primary key: <strong>"<span class="fira-code">{{ primary_key }}</span>"</strong></p> </div> <div class="uk-width-auto"> <a class="uk-button uk-button-default" href="{{ url_for("staff.tables.table", table=table, page=1) }}"><i class="uk-icon fa-fw fas fa-arrow-left"></i> Back</a> <input class="uk-button uk-button-primary" type="submit" id="submit" value="Save" /> </div> <div class="uk-width-1-1"> - <div id="editor" class="uk-textarea" style="resize: vertical; min-height: 15rem;">{{ document }}</div> + <div id="editor" class="uk-textarea">{{ document }}</div> <input type="hidden" name="json" id="json" /> </div> diff --git a/templates/staff/tables/table.html b/templates/staff/tables/table.html index aa26818f..87d981a0 100644 --- a/templates/staff/tables/table.html +++ b/templates/staff/tables/table.html @@ -17,7 +17,7 @@ {% endif %} <h1 class="uk-title uk-text-center"> - <span style="font-family: monospace"> + <span class="fira-code"> {{ table }} {% if table_obj.locked %} @@ -36,7 +36,7 @@ <div class="uk-width-auto uk-flex-auto"> <select class="uk-select uk-width-1-1" name="search-key" title="Table Key"> - <option style="font-weight: bold;">{{ table_obj.primary_key }}</option> + <option class="uk-text-bold">{{ table_obj.primary_key }}</option> {% for key in table_obj.keys %} {% if key != table_obj.primary_key %} {% if search_key == key %} @@ -144,7 +144,7 @@ {% endif %} {% for key in table_obj.keys %} - <td class="uk-text-truncate" style="font-family: monospace" title="{{ doc[key] }}"> + <td class="uk-text-truncate fira-code" title="{{ doc[key] }}"> {% if key == table_obj.primary_key %} <strong>{{ doc[key] }}</strong> {% else %} diff --git a/templates/wiki/base.html b/templates/wiki/base.html index 73b0f47c..2a29d139 100644 --- a/templates/wiki/base.html +++ b/templates/wiki/base.html @@ -10,13 +10,14 @@ <script src="{{ static_file('js/fouc.js') }}"></script> <!-- Other JS loads --> - <script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-beta.39/js/uikit.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-rc.4/js/uikit.min.js"></script> <!-- Static stuff --> <link rel="shortcut icon" href="{{ static_file('favicon.ico') }}"> - <link rel="stylesheet" href="{{ static_file('uikit_blurple.css') }}"/> - <link rel="stylesheet" href="{{ static_file('style.css') }}"/> - <link rel="stylesheet" href="{{ static_file('css/pygments-monokai.css') }}"/> + <link rel="stylesheet" href="{{ static_file('css/uikit_blurple.css') }}"/> + <link rel="stylesheet" href="{{ static_file('css/style.css') }}"/> + <link rel="stylesheet" href="{{ static_file('css/bundled/pygments-monokai.css') }}"/> + <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css"> <!-- OpenGraph metadata --> <meta property="og:title" content="Python Discord | {% block og_title %}{% endblock %}"> @@ -27,7 +28,9 @@ {% endblock %} </head> - <body class="page-{{ current_page.replace(".", "-") }}"> + <body class="{% block page_classes %}{% endblock page_classes %} + page-{{ current_page.replace(".", "-") }} + blueprint-{{ blueprint.replace(".", "-") }}"> <div class="uk-offcanvas-content uk-flex uk-flex-column" id="wiki-page"> {% include "main/navigation.html" %} <div class="uk-flex uk-flex-row uk-flex-1"> @@ -174,12 +177,12 @@ <li> <form action="{{ url_for("wiki.search") }}" method="post"> {% if query is undefined %} - <input type="text" class="uk-input" placeholder="Search (BETA)" id="query" name="query" style="padding-right: 0; margin-top: 5px; border-left: 0; border-right: 0;" required> + <input type="text" class="uk-input sidebar-search-input" placeholder="Search (BETA)" id="query" name="query" required> {% else %} - <input type="text" class="uk-input" placeholder="Search (BETA)" id="query" name="query" value="{{ query }}" style="padding-right: 0; margin-top: 5px; border-left: 0; border-right: 0;" required> + <input type="text" class="uk-input sidebar-search-input" placeholder="Search (BETA)" id="query" name="query" value="{{ query }}" required> {% endif %} <br /> - <button class="uk-button uk-button-darkish uk-button-small" type="submit" id="search" title="Search" style="width: 100%; border: 0;"> + <button class="uk-button uk-button-darkish uk-button-small search-button" type="submit" id="search" title="Search"> <i class="uk-icon fas fa-fw fa-search"></i> </button> @@ -188,11 +191,11 @@ </li> </ul> </div> - <div style="width: 100%;"> + <div class="uk-width-expand full-width"> <a class="uk-flex-left uk-flex uk-flex-column uk-background-primary uk-hidden@s uk-hidden@m uk-hidden@l uk-hidden@xl" id="wiki-sidebar-button"> <div class="uk-flex-center"><i class="uk-icon fa-fw far fa-bars"></i></div> </a> - <div class="uk-section uk-flex uk-flex-column" style="flex-grow: 1; margin: 0 1rem 1rem;"> + <div class="uk-section uk-flex uk-flex-column content"> {% block content %}{% endblock %} </div> </div> diff --git a/templates/wiki/page_edit.html b/templates/wiki/page_edit.html index 34b59dca..69726d93 100644 --- a/templates/wiki/page_edit.html +++ b/templates/wiki/page_edit.html @@ -2,9 +2,12 @@ {% block title %}Wiki | Edit: {{ page }}{% endblock %} {% block og_title %}Wiki | Edit: {{ page }}{% endblock %} {% block og_description %}{% endblock %} + +{% block page_classes %}uses-rst{% endblock %} {% block extra_head %} -<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script> {% endblock %} + {% block content %} <form uk-grid class="uk-grid-small" action="{{ url_for("wiki.edit", page=page) }}" method="post"> <div class="uk-width-expand"> @@ -17,14 +20,14 @@ <input class="uk-button uk-button-primary" type="submit" id="submit" value="Save" disabled /> </div> <div class="uk-width-1-1"> - <div id="editor" class="uk-textarea" style="resize: vertical; min-height: 15rem;">{{ rst }}</div> + <div id="editor" class="uk-textarea">{{ rst }}</div> <input type="hidden" name="rst" id="rst" /> </div> <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/> </form> - <div class="uk-container uk-container-small" style="padding: 1rem 1rem 0.1rem;"> + <div class="uk-container uk-container-small preview-title"> <h2 id="preview-title">{{ title }}</h2> <div id="preview-div"> diff --git a/templates/wiki/page_move.html b/templates/wiki/page_move.html index 409c02e7..2bd772e9 100644 --- a/templates/wiki/page_move.html +++ b/templates/wiki/page_move.html @@ -12,7 +12,7 @@ <h3>Move Page: {{ page }}</h3> <form uk-grid class="uk-grid-small" action="{{ url_for("wiki.move", page=page) }}" method="post"> - <input type="text" class="uk-width-1-1 uk-input" placeholder="{{ page }}" id="location" name="location" style="margin-left: 15px;" required> + <input type="text" class="uk-width-1-1 uk-input location-input" placeholder="{{ page }}" id="location" name="location" required> <div class="uk-width-1-2"> <a href="{{ url_for("wiki.page", page=page) }}" class="uk-button uk-button-secondary uk-width-1-1" type="button" id="cancel">Cancel</a> </div> diff --git a/templates/wiki/page_view.html b/templates/wiki/page_view.html index 5ce22784..c660ed6d 100644 --- a/templates/wiki/page_view.html +++ b/templates/wiki/page_view.html @@ -2,6 +2,8 @@ {% block title %}Wiki | {{ data["title"] }}{% endblock %} {% block og_title %}Wiki | {{ data["title"] }}{% endblock %} {% block og_description %}{% endblock %} +{% block page_classes %}uses-rst{% endblock %} + {% block content %} <div class="uk-container uk-container-small" id="doc-view"> <h2 class="uk-title"> diff --git a/templates/wiki/search.html b/templates/wiki/search.html index 6b15522e..8a337192 100644 --- a/templates/wiki/search.html +++ b/templates/wiki/search.html @@ -9,7 +9,7 @@ </h2> <form uk-grid class="uk-grid-small" action="{{ url_for("wiki.search") }}" method="post"> - <input type="text" class="uk-width-1-1 uk-input" placeholder="Search Query" id="query" name="query" style="margin-left: 15px;" required> + <input type="text" class="uk-width-1-1 uk-input location-input" placeholder="Search Query" id="query" name="query" required> <div class="uk-width-1-4"> </div> diff --git a/templates/wiki/search_results.html b/templates/wiki/search_results.html index 08c303e2..9b9ad946 100644 --- a/templates/wiki/search_results.html +++ b/templates/wiki/search_results.html @@ -21,7 +21,7 @@ {% for page in pages %} <h4> <a href="{{ url_for("wiki.page", page=page["slug"]) }}">{{ page.title }}</a> - (<span style="font-family: monospace;">{{ page.slug }}</span>) + (<span class="fira-code">{{ page.slug }}</span>) </h4> {% for snippet in page["matches"] %} diff --git a/templates/wiki/special_all.html b/templates/wiki/special_all.html index 92aa12a4..45a641a6 100644 --- a/templates/wiki/special_all.html +++ b/templates/wiki/special_all.html @@ -17,7 +17,7 @@ <ul> {% for page in pages %} <li><a href="{{ url_for("wiki.page", page=page.slug) }}"> - {{ page.title }} (<span style="font-family: monospace;">{{ page.slug }}</span>) + {{ page.title }} (<span class="fira-code">{{ page.slug }}</span>) </a></li> {% endfor %} </ul> |