rescue/khaganat-web
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://git.khaganat.net:3543/Tycho/khaganat-web

Browse source
This commit is contained in:
Rodolphe Breard 2019-07-27 17:17:32 +02:00
commit 7979085213
3 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
khaganat/templates/npb/paste_detail.html
View file

@ -10,6 +10,9 @@
{% block title %}{% trans "Untitled" as untitled %}{{ paste.title|default:untitled }}{% endblock %}
{% block content %}
<div class="column is-light">
<article class="tile is-child notification is-white">
{% if paste.is_suspended %}
{% else %}
{% trans "Untitled" as untitled %}
@ -29,7 +32,12 @@
{% blocktrans with date=paste.expire_on %}Expires on {{ date }}{% endblocktrans %}
{% endif %}
</p>
</article>
<article class="tile is-child notification is-paste">
{{ paste.formated_content|safe }}
{% endif %}
</article>
</div>
{% endblock %}

4
navbar/templates/navbar/navbar.html
View file

@ -3,7 +3,7 @@
<nav class="navbar is-light" id="navBar">
<div class="navbar-brand">
<a class="navbar-item" href="{% url 'index' %}"><img src="{% static "khaganat/images/icon_khaganat.png" %}" alt="Khaganat"></a>
<a class="navbar-item" href="{% url 'index' %}"><img src="{% static "khaganat/images/logo_khaganat_128px_notrans.png" %}" alt="Khaganat"></a>
<a role="button" class="navbar-burger" data-target="navMenu" aria-label="menu" aria-expanded="false">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
@ -37,7 +37,7 @@
{% endfor %}
</div>
<div class="navbar-item is-logo">
<a class="navbar-item" href="{% url 'index' %}"><img src="{% static "khaganat/images/icon_khaganat.png" %}" alt="Khaganat"></a>
<a class="navbar-item" href="{% url 'index' %}"><img src="{% static "/khaganat/images/logo_khaganat_128px_notrans.png" %}" alt="Khaganat"></a>
</div>
<div class="navbar-end">
{% if user.is_authenticated %}

47
static_extra/bulma/sass/style.sass
View file

@ -15,6 +15,9 @@ $text-light: #2d1040
//couleur du fond
$background: #AFAED6
$success: turquoise
// 3. Import the rest of Bulma
@import "./node_modules/bulma/bulma"
@ -186,6 +189,10 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top
background-color: $link-hover
color: white
.button.is-success, .button.is-sucess:hover
color: white
//footer
@media screen and (min-width: 1088px)
.footer
@ -311,7 +318,9 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top
background-color: white
color: $text-light
padding: 1rem 1rem 1rem 1rem
text-align: left
max-width: 160ch
.tile.is-light .title, .tile.is-light a:link
color: $link
@ -345,40 +354,30 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top
width: 0rem
display: block
//tile pour le logo
//tile pour le logo fixe
@media screen and (min-width: 770px)
.tile.is-success
.tile.is-fixed
position: fixed
.tile.is-success
.tile.is-fixed
background-color: transparent
.tile.is-success .title
.tile.is-fixed .title
color: $link
//tile pour le pastebin
.tile.is-paste
overflow: scroll hidden
background-color: white
//colonne
//colonne index
@media screen and (min-width: 770px)
.column.is-primary .image, .column.is-primary .title
//position: fixed
//top: 50%
//left: 0
.column.is-primary, .column.is-primary .image
text-align: center
.column.is-primary .title
color: $link
//colonne pour les pages
.column.is-success
margin: 1rem
.column.is-success .title, .column.is-success .subtitle
//colonne index et page
.column.is-primary .title, .column.is-primary .subtitle
color: $link
text-align: center
.column.is-primary, .column.is-primary .image
text-align: center
//section retreci
.section