Remove the last parts of django-bulma

This commit is contained in:
Rodolphe Breard 2020-02-28 19:06:37 +01:00
parent 9abfacb50c
commit b3fd805d40
15 changed files with 11 additions and 37 deletions

View file

@ -22,10 +22,3 @@ Build CSS:
- pipenv install django-bulma - pipenv install django-bulma
- echo "KHAGANAT_SECRET_KEY= build" > .env - echo "KHAGANAT_SECRET_KEY= build" > .env
- pipenv run ./manage.py bulma install
- pipenv run ./manage.py bulma build
artifacts:
paths:
- static_extra/bulma/css/*

View file

@ -13,7 +13,7 @@
In order to have a single Python coding style, please use [black](https://github.com/psf/black). However, auto-generated files and parts of external projects should not be reformatted. In order to have a single Python coding style, please use [black](https://github.com/psf/black). However, auto-generated files and parts of external projects should not be reformatted.
``` ```
$ black $(find . -type f -name "*\.py" -not -path "*/migrations/*" -not -path "./static_extra/bulma/*" -print) $ black $(find . -type f -name "*\.py" -not -path "*/migrations/*" -print)
``` ```
@ -33,16 +33,10 @@ To run this web application, you need a database. The simplest way is to downloa
``` ```
$ pipenv run ./manage.py migrate $ pipenv run ./manage.py migrate
$ pipenv run ./manage.py compilemessages
$ pipenv run ./manage.py createsuperuser $ pipenv run ./manage.py createsuperuser
``` ```
In order to display the Khaganat theme, you have to install bulma and build it :
```
$ pipenv run ./manage.py bulma install
$ pipenv run ./manage.py bulma build
```
Now that everything has been set-up, you may run Django's internal debug server. Now that everything has been set-up, you may run Django's internal debug server.
``` ```

View file

@ -1,5 +1,4 @@
{% extends "khaganat/base.html" %} {% extends "khaganat/base.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block content %} {% block content %}

View file

@ -1,5 +1,4 @@
{% extends "khaganat/base.html" %} {% extends "khaganat/base.html" %}
{% load bulma_tags %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}

View file

@ -1,5 +1,4 @@
{% extends "khaganat/centered_dialog.html" %} {% extends "khaganat/centered_dialog.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans 'New paste' %}{% endblock %} {% block title %}{% trans 'New paste' %}{% endblock %}
@ -9,7 +8,7 @@
{% block dialog %} {% block dialog %}
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{{ form|bulma }} {{ form.as_p }}
<button type="submit" class="button is-link">{% trans "Submit" %}</button> <button type="submit" class="button is-link">{% trans "Submit" %}</button>
</form> </form>
{% endblock %} {% endblock %}

View file

@ -1,5 +1,4 @@
{% extends "khaganat/centered_dialog.html" %} {% extends "khaganat/centered_dialog.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans 'Report paste' %}{% endblock %} {% block title %}{% trans 'Report paste' %}{% endblock %}
@ -9,7 +8,7 @@
{% block dialog %} {% block dialog %}
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{{ form|bulma }} {{ form.as_p }}
<button type="submit" class="button is-warning">{% trans "Submit" %}</button> <button type="submit" class="button is-warning">{% trans "Submit" %}</button>
</form> </form>
{% endblock %} {% endblock %}

View file

@ -1,5 +1,4 @@
{% extends "khaganat/centered_dialog.html" %} {% extends "khaganat/centered_dialog.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "login"|capfirst %}{% endblock %} {% block title %}{% trans "login"|capfirst %}{% endblock %}
@ -8,7 +7,7 @@
{% block dialog %} {% block dialog %}
<form method="post" action="{% url 'login' %}"> <form method="post" action="{% url 'login' %}">
{% csrf_token %} {% csrf_token %}
{{ form|bulma }} {{ form.as_p }}
<input type="hidden" name="next" value="{{ request.GET.next }}" /> <input type="hidden" name="next" value="{{ request.GET.next }}" />
<button type="submit" class="button is-link">{% trans "login"|capfirst %}</button> <button type="submit" class="button is-link">{% trans "login"|capfirst %}</button>
<a class="button is-light" href="{% url "password_reset" %}" role="button">{% trans "forgotten_password"|capfirst %}</a> <a class="button is-light" href="{% url "password_reset" %}" role="button">{% trans "forgotten_password"|capfirst %}</a>

View file

@ -1,5 +1,4 @@
{% extends "khaganat/centered_dialog.html" %} {% extends "khaganat/centered_dialog.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "password_reset"|capfirst %}{% endblock %} {% block title %}{% trans "password_reset"|capfirst %}{% endblock %}
@ -8,7 +7,7 @@
{% block dialog %} {% block dialog %}
<form method="post" action="{% url 'password_reset' %}"> <form method="post" action="{% url 'password_reset' %}">
{% csrf_token %} {% csrf_token %}
{{ form|bulma }} {{ form.as_p }}
<button type="submit" class="button is-link">{% trans "reset_my_password"|capfirst %}</button> <button type="submit" class="button is-link">{% trans "reset_my_password"|capfirst %}</button>
</form> </form>
{% endblock %} {% endblock %}

View file

@ -1,5 +1,4 @@
{% extends "khaganat/centered_dialog.html" %} {% extends "khaganat/centered_dialog.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% if validlink %}{% trans "set_new_password"|capfirst %}{% else %}{% trans "password_reset"|capfirst %}{% endif %}{% endblock %} {% block title %}{% if validlink %}{% trans "set_new_password"|capfirst %}{% else %}{% trans "password_reset"|capfirst %}{% endif %}{% endblock %}

View file

@ -1,5 +1,4 @@
{% extends "khaganat/centered_dialog.html" %} {% extends "khaganat/centered_dialog.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "register"|capfirst %}{% endblock %} {% block title %}{% trans "register"|capfirst %}{% endblock %}
@ -9,7 +8,7 @@
{% block dialog %} {% block dialog %}
<form method="post" action="{% url 'register' %}"> <form method="post" action="{% url 'register' %}">
{% csrf_token %} {% csrf_token %}
{{ form|bulma }} {{ form.as_p }}
<button type="submit" class="button is-link">{% trans "register"|capfirst %}</button> <button type="submit" class="button is-link">{% trans "register"|capfirst %}</button>
</form> </form>
{% endblock %} {% endblock %}

View file

@ -1,5 +1,4 @@
{% extends "khaganat/base.html" %} {% extends "khaganat/base.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block content %} {% block content %}

View file

@ -1,5 +1,4 @@
{% extends "neluser/settings/preferences/base.html" %} {% extends "neluser/settings/preferences/base.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "NSFW content" %}{% endblock %} {% block title %}{% trans "NSFW content" %}{% endblock %}

View file

@ -1,5 +1,4 @@
{% extends "neluser/settings/security/base.html" %} {% extends "neluser/settings/security/base.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "delete_account"|capfirst %}{% endblock %} {% block title %}{% trans "delete_account"|capfirst %}{% endblock %}
@ -7,7 +6,7 @@
{% block inner_panel %} {% block inner_panel %}
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{{ form|bulma }} {{ form.as_p }}
<button type="submit" class="button is-danger">{% trans "Permanently delete my account"|capfirst %}</button> <button type="submit" class="button is-danger">{% trans "Permanently delete my account"|capfirst %}</button>
</form> </form>
{% endblock %} {% endblock %}

View file

@ -1,5 +1,4 @@
{% extends "neluser/settings/security/base.html" %} {% extends "neluser/settings/security/base.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "Password"|capfirst %}{% endblock %} {% block title %}{% trans "Password"|capfirst %}{% endblock %}
@ -7,7 +6,7 @@
{% block inner_panel %} {% block inner_panel %}
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{{ form|bulma }} {{ form.as_p }}
<button type="submit" class="button is-link">{% trans "change_my_password"|capfirst %}</button> <button type="submit" class="button is-link">{% trans "change_my_password"|capfirst %}</button>
</form> </form>
{% endblock %} {% endblock %}

View file

@ -1,5 +1,4 @@
{% extends "khaganat/centered_dialog.html" %} {% extends "khaganat/centered_dialog.html" %}
{% load bulma_tags %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "authenticate"|capfirst %}{% endblock %} {% block title %}{% trans "authenticate"|capfirst %}{% endblock %}