mirror of
https://framagit.org/la-chariotte/la-chariotte.git
synced 2025-05-01 11:22:24 +02:00
Grouped Order descriptions keeps carriage returns
- Added a few useful info in the docs on how to install sass
This commit is contained in:
parent
a4bec7eed5
commit
74815fa06d
4 changed files with 17 additions and 4 deletions
|
@ -121,7 +121,7 @@ python manage.py runserver --settings=local_settings
|
|||
|
||||
Pour créer un superutilisateur, qui aura accès à l'interface admin (/admin) :
|
||||
```shell
|
||||
python manage.py createsuperuser
|
||||
python manage.py createsuperuser --settings=local_settings
|
||||
```
|
||||
|
||||
### Travailler sur le frontend
|
||||
|
@ -132,6 +132,11 @@ Nous utilisons bulma comme framework CSS. Vous pouvez l'installer en utilisant l
|
|||
npm install bulma
|
||||
```
|
||||
|
||||
Vous aurez aussi besoin de sass :
|
||||
```bash
|
||||
npm install -g sass
|
||||
```
|
||||
|
||||
Vérifiez que vous utilisez la bonne version de sass :
|
||||
|
||||
```bash
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
<div class="columns">
|
||||
<div class="column is-8">
|
||||
<p class="title">{{ grouped_order }}</p>
|
||||
{% if grouped_order.description %}<p>{{ grouped_order.description }}</p>{% endif %}
|
||||
{% if grouped_order.description %}<p class="formatted-text">{{ grouped_order.description }}</p>{% endif %}
|
||||
{% if not user.is_authenticated %}
|
||||
<p><span class="has-text-dark is-italic">Vous êtes l'organisateur·ice ?</span>
|
||||
<a href="{% url 'order:grouped_order_overview' grouped_order.code %}">
|
||||
|
|
|
@ -214,7 +214,8 @@ fieldset[disabled] .file-name, fieldset[disabled] .select select, .select fields
|
|||
padding: 0;
|
||||
}
|
||||
|
||||
/* Bulma Base */ /*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */
|
||||
/* Bulma Base */
|
||||
/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */
|
||||
html,
|
||||
body,
|
||||
p,
|
||||
|
@ -10386,6 +10387,10 @@ a.navbar-item:hover {
|
|||
padding-top: 3.25rem;
|
||||
}
|
||||
}
|
||||
.formatted-text {
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
.button {
|
||||
white-space: normal;
|
||||
height: auto;
|
||||
|
|
|
@ -7,3 +7,6 @@
|
|||
.content
|
||||
margin: $small
|
||||
padding-top: $navbar-height
|
||||
|
||||
.formatted-text
|
||||
white-space: pre-wrap
|
Loading…
Reference in a new issue