Merge remote-tracking branch 'rico/new-design' into new-design

diff --git a/src/templates/docs/diff.html b/src/templates/docs/diff.html
index 80b6b523f524a94caa479a29a97cf4d22180520e..18cb5e75a82a2747776b6cba3cd736347037d540 100644 (file)
--- a/src/templates/docs/diff.html
+++ b/src/templates/docs/diff.html
@@ -3,27 +3,27 @@
 {% block title %}{{ _("Differences in Revisions") }} - {{ page.title }}{% end block %}
 
 {% block main %}
-       <div class="card mb-3">
-               <div class="card-body">
-                       <h4 class="card-title">
+       <div class="container">
+               <section class="section">
+                       <h4 class="title is-4 has-text-centered">
                                {{ _("Differences in Revisions: %s") % page.title }}
                        </h4>
 
-                       <div class="row mb-3">
-                               <div class="col col-md-5 text-center">
-                                       <h6 class="mb-0">{{ _("Older Revision") }}</h6>
+                       <div class="columns">
+                               <div class="column is-one-third has-text-centered">
+                                       <h6 class="title is-6">{{ _("Older Revision") }}</h6>
 
                                        <a href="{{ a.url }}?revision={{ a.timestamp.isoformat() }}">
                                                {{ locale.format_date(a.timestamp) }}
                                        </a>
                                </div>
 
-                               <div class="col col-md-2 text-center">
+                               <div class="column is-one-third has-text-centered">
                                        &raquo;
                                </div>
 
-                               <div class="col col-md-5 text-center">
-                                       <h6 class="mb-0">{{ _("Newer Revision") }}</h6>
+                               <div class="column is-one-third has-text-centered">
+                                       <h6 class="title is-6">{{ _("Newer Revision") }}</h6>
 
                                        <a href="{{ b.url }}?revision={{ b.timestamp.isoformat() }}">
                                                {{ locale.format_date(b.timestamp) }}
@@ -32,8 +32,8 @@
                        </div>
 
                        {% if b.changes %}
-                               <div class="alert alert-light">
-                                       {{ b.changes }}
+                               <div class="notification has-text-centered">
+                                       {{ b.changes }}
                                </div>
                        {% end %}
 

diff --git a/src/templates/docs/modules/diff.html b/src/templates/docs/modules/diff.html
index d657f153f1eb9337cbda3ff2facb1157e1fdb0c8..42f1fec2683e409e91eca2c229fba1093becf1e6 100644 (file)
--- a/src/templates/docs/modules/diff.html
+++ b/src/templates/docs/modules/diff.html
@@ -1,11 +1,13 @@
-<table class="table table-sm small font-monospace">
-       <tbody>
-               {% for line in diff %}
-                       {% if not line.startswith("?") %}
-                               <tr class="{% if line.startswith("+") %}table-success{% elif line.startswith("-") %}table-danger{% end %}">
-                                       <td>{% if line[2:] %}{{ line[2:] }}{% else %}&nbsp;{% end %}</td>
-                               </tr>
+<div class="container">
+       <table class="table is-family-monospace">
+               <tbody>
+                       {% for line in diff %}
+                               {% if not line.startswith("?") %}
+                                       <tr class="{% if line.startswith("+") %}is-success{% elif line.startswith("-") %}is-danger{% end %}">
+                                               <td>{% if line[2:] %}{{ line[2:] }}{% else %}&nbsp;{% end %}</td>
+                                       </tr>
+                               {% end %}
                        {% end %}
-               {% end %}
-       </tbody>
-</table>
+               </tbody>
+       </table>
+</div>
\ No newline at end of file

diff --git a/src/templates/docs/modules/list.html b/src/templates/docs/modules/list.html
index 3891a291bad71a90c279d6c6200d4e2e082d77e7..fd7546edd1cf2839928ee694117a83acab9c6b0a 100644 (file)
--- a/src/templates/docs/modules/list.html
+++ b/src/templates/docs/modules/list.html
@@ -1,40 +1,42 @@
 {% for page in pages %}
-       <strong class="mb-0">
-               {% if show_breadcrumbs %}
-                       {% for url, title in page.breadcrumbs %}
-                               <a href="{{ url }}">{{ title }}</a> /
+       <div class="block">
+               <strong>
+                       {% if show_breadcrumbs %}
+                               {% for url, title in page.breadcrumbs %}
+                                       <a href="{{ url }}">{{ title }}</a> /
+                               {% end %}
                        {% end %}
-               {% end %}
 
-               <a href="{{ page.url }}{% if link_revision %}?revision={{ page.timestamp.isoformat() }}{% end %}">{{ page.title }}</a>
-       </strong>
+                       <a href="{{ page.url }}{% if link_revision %}?revision={{ page.timestamp.isoformat() }}{% end %}">{{ page.title }}</a>
+               </strong>
 
-       <p class="text-muted small">
-               {% if show_author %}
-                       {{ _("Last edited %s") % locale.format_date(page.timestamp, shorter=True, relative=False) }}
+               <p class="is-size-6">
+                       {% if show_author %}
+                               {{ _("Last edited %s") % locale.format_date(page.timestamp, shorter=True, relative=False) }}
 
-                       {% if page.author %}
-                               {{ _("by") }}
-                               <a href="/users/{{ page.author.uid }}">{{ page.author }}</a>
+                               {% if page.author %}
+                                       {{ _("by") }}
+                                       <a href="/users/{{ page.author.uid }}">{{ page.author }}</a>
+                               {% end %}
                        {% end %}
-               {% end %}
 
-               {% if show_changes %}
-                       {% if page.changes %}
-                               &bull; {{ page.changes }}
+                       {% if show_changes %}
+                               {% if page.changes %}
+                                       &bull; {{ page.changes }}
+                               {% end %}
+
+                               {% if page.previous_revision %}
+                                       <a href="{{ page.url }}?action=diff&a={{ page.previous_revision.timestamp.isoformat() }}&b={{ page.timestamp.isoformat() }}">
+                                               <span class="fas fa-exchange-alt ml-1"></span>
+                                       </a>
+                               {% end %}
                        {% end %}
 
-                       {% if page.previous_revision %}
-                               <a href="{{ page.url }}?action=diff&a={{ page.previous_revision.timestamp.isoformat() }}&b={{ page.timestamp.isoformat() }}">
-                                       <span class="fas fa-exchange-alt ml-1"></span>
+                       {% if not page.is_latest_revision() %}
+                               <a href="{{ page.url }}?action=restore&revision={{ page.timestamp.isoformat() }}" title="{{ _("Restore") }}">
+                                       <span class="fas fa-undo ml-1"></span>
                                </a>
                        {% end %}
-               {% end %}
-
-               {% if not page.is_latest_revision() %}
-                       <a href="{{ page.url }}?action=restore&revision={{ page.timestamp.isoformat() }}" title="{{ _("Restore") }}">
-                               <span class="fas fa-undo ml-1"></span>
-                       </a>
-               {% end %}
-       </p>
+               </p>
+       </div>
 {% end %}

diff --git a/src/templates/docs/revisions.html b/src/templates/docs/revisions.html
index 7f9befc493725feead19a3da91a0a72181a48672..90f74eea88972e025328a9b163c71b5947570649 100644 (file)
--- a/src/templates/docs/revisions.html
+++ b/src/templates/docs/revisions.html
@@ -3,11 +3,11 @@
 {% block title %}{{ _("Revisions of %s") % page.title }}{% end block %}
 
 {% block main %}
-       <div class="card mb-3">
-               <div class="card-body">
-            <h4 class="card-title">{{ _("Revisions of %s") % page.title }}</h4>
+       <section class="section">
+               <div class="container">
+                       <h4 class="title is-4">{{ _("Revisions of %s") % page.title }}</h4>
 
                        {% module DocsList(page.get_revisions(), show_breadcrumbs=False, link_revision=True, show_changes=True) %}
                </div>
-       </div>
-{% end block %}
+       </section>
+{% end block %}
\ No newline at end of file

diff --git a/src/templates/docs/watchlist.html b/src/templates/docs/watchlist.html
index a21798f6a39fb39cf127709749112c590279819b..248fa9fe5c48b2d481f4c41c1dd7d466e01e827c 100644 (file)
--- a/src/templates/docs/watchlist.html
+++ b/src/templates/docs/watchlist.html
@@ -3,14 +3,14 @@
 {% block title %}{{ _("Your Watchlist") }}{% end block %}
 
 {% block main %}
-       <div class="card">
-               <div class="card-body">
-                       <h5>{{ _("Your Watchlist") }}</h5>
+       <div class="container">
+               <div class="section">
+                       <h5 class="title is-5">{{ _("Your Watchlist") }}</h5>
 
                        {% if pages %}
                                {% module DocsList(pages) %}
                        {% else %}
-                               <div class="alert alert-light mb-0">
+                               <div class="notification">
                                        {{ _("You do not have any pages on your watchlist") }}
                                </div>
                        {% end %}

diff --git a/src/templates/donate/thank-you.html b/src/templates/donate/thank-you.html
index 2b6d9a38c06853278f1297d14ab2a79373be265e..8a8a32f4aa8481a6aaa4f5129b61a6f240f357dc 100644 (file)
--- a/src/templates/donate/thank-you.html
+++ b/src/templates/donate/thank-you.html
@@ -3,16 +3,15 @@
 {% block title %}{{ _("Thank You!") }}{% end block %}
 
 {% block container %}
-       <section>
-               <div class="container">
-                       <div class="row">
-                               <div class="col col-lg-6">
-                                       <h1 class="display-2">{{ _("Thank You") }}</h1>
-
-                                       <p>
-                                               {{ _("Thank you very much for your donation to the IPFire Project.") }}
-                                       </p>
-                               </div>
+       <section class="hero is-primary is-fullheight-with-navbar">
+               <div class="hero-body">
+                       <div class="container">
+                               <h1 class="title is-1">
+                                       {{ _("Thank You") }}
+                               </h1>
+                               <p class="subtitle">
+                                       {{ _("Thank you very much for your donation to the IPFire Project.") }}
+                               </p>
                        </div>
                </div>
        </section>