CSS: Replace btn-block with buttons wrapped in d-grid

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/about.html b/src/templates/about.html
index 0a63667e81e91e4511515f687db80c36aa1e3030..7893fff9263364f4fff3789290225cb609094922 100644 (file)
--- a/src/templates/about.html
+++ b/src/templates/about.html
@@ -162,9 +162,11 @@
 
        <div class="container">
                <section>
-                       <a class="btn btn-primary btn-lg btn-block" href="/download">
-                               {{ _("Download IPFire now. It's free!") }}
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-primary btn-lg" href="/download">
+                                       {{ _("Download IPFire now. It's free!") }}
+                               </a>
+                       </div>
                </section>
 
                <section>

diff --git a/src/templates/auth/activate.html b/src/templates/auth/activate.html
index 472a41ea3f052d7f4a7f46cff5dda545f3bea15b..6d59ad423cdc4132183f75dfd75c726ac84c9542 100644 (file)
--- a/src/templates/auth/activate.html
+++ b/src/templates/auth/activate.html
@@ -17,9 +17,11 @@
 
                                {% module Password() %}
 
-                               <button type="submit" class="btn btn-primary btn-block" disabled>
-                                       {{ _("Activate Account") }}
-                               </button>
+                               <div class="d-grid">
+                                       <button type="submit" class="btn btn-primary" disabled>
+                                               {{ _("Activate Account") }}
+                                       </button>
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/auth/activated.html b/src/templates/auth/activated.html
index 70b8c926a929a201468405e122ec3439c4786eff..eff7ffdbfe98685f65408de5a4410d7ff2ad796c 100644 (file)
--- a/src/templates/auth/activated.html
+++ b/src/templates/auth/activated.html
@@ -11,9 +11,11 @@
                                {{ _("To kick things off, would you like to setup a donation to the IPFire Project?") }}
                        </p>
 
-                       <a class="btn btn-lg btn-block btn-primary mb-1" href="https://www.ipfire.org/donate?first_name={{ url_escape(account.first_name) }}&last_name={{ url_escape(account.last_name) }}">
-                               {{ _("Donate Now") }}
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-lg btn-primary mb-1" href="https://www.ipfire.org/donate?first_name={{ url_escape(account.first_name) }}&last_name={{ url_escape(account.last_name) }}">
+                                       {{ _("Donate Now") }}
+                               </a>
+                       </div>
 
                        <a class="link-secondary small" href="/">
                                {{ _("No thanks, I have already donated") }}

diff --git a/src/templates/auth/login.html b/src/templates/auth/login.html
index 5810d4a1d4b3956a3a4b16606df47a06d4f8f3c1..238e06fb6ebe09f1de63fdf919bdd5ad9cf7ac6c 100644 (file)
--- a/src/templates/auth/login.html
+++ b/src/templates/auth/login.html
@@ -32,9 +32,11 @@
                                                name="password" placeholder="{{ _("Password") }}" required>
                                </div>
 
-                               <button type="submit" class="btn btn-primary btn-block mb-2">
-                                       {{ _("Log in") }}
-                               </button>
+                               <div class="d-grid">
+                                       <button type="submit" class="btn btn-primary mb-2">
+                                               {{ _("Log in") }}
+                                       </button>
+                               </div>
 
                                <p class="small">
                                        <a class="text-muted" href="//people.ipfire.org/password-reset{% if incorrect %}?username={{ username }}{% end %}">
@@ -45,9 +47,11 @@
 
                        <h6>{{ _("New to IPFire?") }}</h6>
 
-                       <a class="btn btn-dark btn-sm btn-block" href="https://people.ipfire.org/register">
-                               {{ _("Register") }}
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-dark btn-sm" href="https://people.ipfire.org/register">
+                                       {{ _("Register") }}
+                               </a>
+                       </div>
                </div>
        </div>
 {% end block %}

diff --git a/src/templates/auth/password-reset-initiation.html b/src/templates/auth/password-reset-initiation.html
index b3d09056a8b72c3fc11df8f2c56f37eb4bf353ce..fb368d360946d6d9232d0b6611635578fd466bfd 100644 (file)
--- a/src/templates/auth/password-reset-initiation.html
+++ b/src/templates/auth/password-reset-initiation.html
@@ -18,9 +18,11 @@
                                                                value="{{ username or "" }}" required autofocus>
                                                </div>
 
-                                               <button type="submit" class="btn btn-primary btn-block">
-                                                       {{ _("Reset Password") }}
-                                               </button>
+                                               <div class="d-grid">
+                                                       <button type="submit" class="btn btn-primary">
+                                                               {{ _("Reset Password") }}
+                                                       </button>
+                                               </div>
                                        </form>
                                </div>
                        </div>

diff --git a/src/templates/auth/password-reset.html b/src/templates/auth/password-reset.html
index 3a26a170c07c0e1a45a6bd78b4633013f508eb3d..17657d62fff173e4b78dc5bf48c9a881022d95b8 100644 (file)
--- a/src/templates/auth/password-reset.html
+++ b/src/templates/auth/password-reset.html
@@ -12,9 +12,11 @@
 
                                {% module Password(account) %}
 
-                               <button type="submit" class="btn btn-primary btn-block" disabled>
-                                       {{ _("Reset Password") }}
-                               </button>
+                               <div class="d-grid">
+                                       <button type="submit" class="btn btn-primary" disabled>
+                                               {{ _("Reset Password") }}
+                                       </button>
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/auth/register.html b/src/templates/auth/register.html
index 52193be6f0850554d3490ad80a4ecee2b530e9b5..86842060384af82921b88d83243e3fca9de913fb 100644 (file)
--- a/src/templates/auth/register.html
+++ b/src/templates/auth/register.html
@@ -61,9 +61,11 @@
                                        </div>
                                </div>
 
-                               <button type="submit" class="btn btn-primary btn-block" disabled>
-                                       {{ _("Register") }}
-                               </button>
+                               <div class="d-grid">
+                                       <button type="submit" class="btn btn-primary" disabled>
+                                               {{ _("Register") }}
+                                       </button>
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/base.html b/src/templates/base.html
index 6db06e0204ece18938db2d04f9519f2f4f3c66ae..fe272d210ff8abf775ed12156bdc9d4ffeb8f119 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -281,19 +281,15 @@
                                                        </div>
 
                                                        <div class="col-12 col-lg-2">
-                                                               <ul>
-                                                                       <li>
-                                                                               <a class="btn btn-primary btn-block text-uppercase" href="https://www.ipfire.org/donate">
-                                                                                       {{ _("Donate") }}
-                                                                               </a>
-                                                                       </li>
-
-                                                                       <li>
-                                                                               <a class="btn btn-lwl btn-block text-uppercase" href="https://store.lightningwirelabs.com/">
-                                                                                       {{ _("Buy") }}
-                                                                               </a>
-                                                                       </li>
-                                                               </ul>
+                                                               <div class="d-grid gap-2">
+                                                                       <a class="btn btn-primary text-uppercase" href="https://www.ipfire.org/donate">
+                                                                               {{ _("Donate") }}
+                                                                       </a>
+
+                                                                       <a class="btn btn-lwl text-uppercase" href="https://store.lightningwirelabs.com/">
+                                                                               {{ _("Buy") }}
+                                                                       </a>
+                                                               </div>
                                                        </div>
                                                </div>
                                        </div>

diff --git a/src/templates/blog/compose.html b/src/templates/blog/compose.html
index 880869bb9819cb7c4a226cb9a283156aeeb77ecf..9051e765c8b252091ebe046e8254fb1840a8357c 100644 (file)
--- a/src/templates/blog/compose.html
+++ b/src/templates/blog/compose.html
@@ -26,15 +26,17 @@
                                        </div>
                                </div>
 
-                               <button type="submit" class="btn btn-primary btn-block">
-                                       {{ _("Save") }}
-                               </button>
+                               <div class="d-grid gap-2">
+                                       <button type="submit" class="btn btn-primary">
+                                               {{ _("Save") }}
+                                       </button>
 
-                               {% if post %}
-                                       <a class="btn btn-outline-primary btn-block" href="/post/{{ post.slug }}/delete">
-                                               {{ _("Delete") }}
-                                       </a>
-                               {% end %}
+                                       {% if post %}
+                                               <a class="btn btn-outline-primary" href="/post/{{ post.slug }}/delete">
+                                                       {{ _("Delete") }}
+                                               </a>
+                                       {% end %}
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/blog/delete.html b/src/templates/blog/delete.html
index b4230b9a5086bb3b8209e77a8e664f36e2540f18..410e057c4a3f53c897d17dca1e2bc3cf00cb9bf2 100644 (file)
--- a/src/templates/blog/delete.html
+++ b/src/templates/blog/delete.html
@@ -15,8 +15,10 @@
                        <form action="" method="POST">
                                {% raw xsrf_form_html() %}
 
-                               <button type="submit" class="btn btn-primary btn-block">{{ _("Delete") }}</button>
-                               <a class="btn btn-secondary btn-block" href="/post/{{ post.slug }}">{{ _("Cancel") }}</a>
+                               <div class="d-grid gap-2">
+                                       <button type="submit" class="btn btn-primary">{{ _("Delete") }}</button>
+                                       <a class="btn btn-secondary" href="/post/{{ post.slug }}">{{ _("Cancel") }}</a>
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/blog/modules/post.html b/src/templates/blog/modules/post.html
index c8ddc8c090c1251a2969d08eeefda0e70af38c82..8ff9c1ba24344c54cc47f43d5786f620d2ee8bbb 100644 (file)
--- a/src/templates/blog/modules/post.html
+++ b/src/templates/blog/modules/post.html
@@ -35,15 +35,19 @@
        {% if not post.is_published() and post.is_editable(current_user) %}
                <div class="row">
                        <div class="col-12 col-md-6 mb-3">
-                               <a class="btn btn-success btn-block" href="/post/{{ post.slug }}/edit">
-                                       <span class="fas fa-edit mr-2"></span> {{ _("Edit") }}
-                               </a>
+                               <div class="d-grid">
+                                       <a class="btn btn-success" href="/post/{{ post.slug }}/edit">
+                                               <span class="fas fa-edit mr-2"></span> {{ _("Edit") }}
+                                       </a>
+                               </div>
                        </div>
 
                        <div class="col-12 col-md-6 mb-3">
-                               <a class="btn btn-primary btn-block" href="/post/{{ post.slug }}/publish">
-                                       <span class="fas fa-book-reader mr-2"></span> {{ _("Publish") }}
-                               </a>
+                               <div class="d-grid">
+                                       <a class="btn btn-primary" href="/post/{{ post.slug }}/publish">
+                                               <span class="fas fa-book-reader mr-2"></span> {{ _("Publish") }}
+                                       </a>
+                               </div>
                        </div>
                </div>
        {% end %}

diff --git a/src/templates/blog/publish.html b/src/templates/blog/publish.html
index 2e88122233f58ab378582355a1c7bc6e87aac6c8..e4d4cde781c6fe24492cefcef3fc0f0f7e7197cd 100644 (file)
--- a/src/templates/blog/publish.html
+++ b/src/templates/blog/publish.html
@@ -20,8 +20,10 @@
                                                pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}" required>
                                </div>
 
-                               <button type="submit" class="btn btn-primary btn-block">{{ _("Publish") }}</button>
-                               <a class="btn btn-secondary btn-block" href="/post/{{ post.slug }}">{{ _("Cancel") }}</a>
+                               <div class="d-grid gap-2">
+                                       <button type="submit" class="btn btn-primary">{{ _("Publish") }}</button>
+                                       <a class="btn btn-secondary" href="/post/{{ post.slug }}">{{ _("Cancel") }}</a>
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/donate/donate.html b/src/templates/donate/donate.html
index 11928550326457fcbff8aa65a680a24ec07fc9ca..a6f3c09ff54b9f563a96a9477f2d5deb1b7cca5a 100644 (file)
--- a/src/templates/donate/donate.html
+++ b/src/templates/donate/donate.html
@@ -204,20 +204,24 @@
                                                                                        <div class="row mb-4">
                                                                                                {% for factor, default in ((3, False), (2, True), (1, False)) %}
                                                                                                        <div class="col d-flex align-items-center">
-                                                                                                               <button type="submit"
-                                                                                                                               class="btn btn-primary btn-block {% if default %}btn-lg{% else %}btn-sm{% end %} monthly-amount-suggestion"
-                                                                                                                               data-factor="{{ factor }}" data-amount="">
-                                                                                                                       <span class="EUR">€</span><span class="USD">$</span><span class="suggested-amount"></span>
-                                                                                                                       <br>
-                                                                                                                       <small>/ {{ _("month") }}</small>
-                                                                                                               </button>
+                                                                                                               <div class="d-grid">
+                                                                                                                       <button type="submit"
+                                                                                                                                       class="btn btn-primary {% if default %}btn-lg{% else %}btn-sm{% end %} monthly-amount-suggestion"
+                                                                                                                                       data-factor="{{ factor }}" data-amount="">
+                                                                                                                               <span class="EUR">€</span><span class="USD">$</span><span class="suggested-amount"></span>
+                                                                                                                               <br>
+                                                                                                                               <small>/ {{ _("month") }}</small>
+                                                                                                                       </button>
+                                                                                                               </div>
                                                                                                        </div>
                                                                                                {% end %}
                                                                                        </div>
 
-                                                                                       <button type="submit" class="btn btn-secondary btn-block">
-                                                                                               Donate <span class="EUR">€</span><span class="USD">$</span><span class="amount"></span> once
-                                                                                       </button>
+                                                                                       <div class="d-grid">
+                                                                                               <button type="submit" class="btn btn-secondary">
+                                                                                                       Donate <span class="EUR">€</span><span class="USD">$</span><span class="amount"></span> once
+                                                                                               </button>
+                                                                                       </div>
                                                                                </div>
                                                                        </div>
                                                                </div>

diff --git a/src/templates/download/release.html b/src/templates/download/release.html
index 52828137717cb6dc011f55e520af36689f30e56b..566292fdb35928db235a714ba4c6e4ca33c73725 100644 (file)
--- a/src/templates/download/release.html
+++ b/src/templates/download/release.html
@@ -91,9 +91,11 @@
                                {{ _("All downloads will be served from one of our mirror servers that are sponsored by various organisations from all around the world to help us make IPFire available for everyone") }}
                        </p>
 
-                       <a class="btn btn-light btn-block" href="/download/mirrors">
-                               {{ _("Browse Mirrors") }}
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-light" href="/download/mirrors">
+                                       {{ _("Browse Mirrors") }}
+                               </a>
+                       </div>
                </section>
        </div>
 {% end block %}

diff --git a/src/templates/fireinfo/index.html b/src/templates/fireinfo/index.html
index 40e86be89b07197f9708445c5429e80e86058a9a..d2d59b28004b954aaf1b4dbb23a81f61b92e2911 100644 (file)
--- a/src/templates/fireinfo/index.html
+++ b/src/templates/fireinfo/index.html
@@ -12,9 +12,11 @@
                                data from IPFire systems
                        </p>
 
-                       <a class="btn btn-primary btn-block my-3" href="/profile/random">
-                               {{ _("Show a Random Profile") }}
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-primary my-3" href="/profile/random">
+                                       {{ _("Show a Random Profile") }}
+                               </a>
+                       </div>
                </div>
        </div>
 
@@ -101,9 +103,11 @@
                                                {% end %}
                                        </dl>
 
-                                       <a class="btn btn-sm btn-light btn-block" href="/processors">
-                                               {{ _("Processor Features") }}
-                                       </a>
+                                       <div class="d-grid">
+                                               <a class="btn btn-sm btn-light" href="/processors">
+                                                       {{ _("Processor Features") }}
+                                               </a>
+                                       </div>
                                </div>
                        </div>
                </div>

diff --git a/src/templates/fireinfo/profile.html b/src/templates/fireinfo/profile.html
index 11bf830001124cc6994a307b30e2fe3cceeb5c2b..e9ad437f165a076e296c3f24d7614672772dd870 100644 (file)
--- a/src/templates/fireinfo/profile.html
+++ b/src/templates/fireinfo/profile.html
@@ -27,9 +27,11 @@
                                                                </div>
 
                                                                <div class="col-12 col-sm-5 d-flex align-items-center">
-                                                                       <a class="btn btn-lwl btn-block text-truncate" href="https://www.lightningwirelabs.com">
-                                                                               {{ _("Go to Lightning Wire Labs") }} <span class="fas fa-external-link-alt ml-2"></span>
-                                                                       </a>
+                                                                       <div class="d-grid">
+                                                                               <a class="btn btn-lwl text-truncate" href="https://www.lightningwirelabs.com">
+                                                                                       {{ _("Go to Lightning Wire Labs") }} <span class="fas fa-external-link-alt ml-2"></span>
+                                                                               </a>
+                                                                       </div>
                                                                </div>
                                                        </div>
                                                </div>

diff --git a/src/templates/location/lookup.html b/src/templates/location/lookup.html
index 097d3e7cdca941868f7f4f7629a5c58fd69f6767..59cea88fb46a9ea3e8e652df88788b5631c011b5 100644 (file)
--- a/src/templates/location/lookup.html
+++ b/src/templates/location/lookup.html
@@ -41,9 +41,11 @@
                                </dd>
                        </dl>
 
-                       <a class="btn btn-light btn-block" href="/lookup/{{ address }}/blacklists">
-                               {{ _("Blacklist Status") }}
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-light" href="/lookup/{{ address }}/blacklists">
+                                       {{ _("Blacklist Status") }}
+                               </a>
+                       </div>
                </div>
        </div>
 {% end block %}

diff --git a/src/templates/modules/christmas-banner.html b/src/templates/modules/christmas-banner.html
index ad7e67dac982be94ab7bfd975c8eecd9f07146dd..168be0097482d9cd7ae2f0e636fa456165a11c4e 100644 (file)
--- a/src/templates/modules/christmas-banner.html
+++ b/src/templates/modules/christmas-banner.html
@@ -16,9 +16,11 @@
                     </div>
 
                     <div class="col-12 col-lg-4">
-                        <a class="btn btn-primary btn-block" href="/donate">
-                            {{ _("Give A Gift Today") }}
-                        </a>
+                       <div class="d-grid">
+                                                       <a class="btn btn-primary" href="/donate">
+                                                               {{ _("Give A Gift Today") }}
+                                                       </a>
+                                               </div>
                     </div>
                 </div>
             </div>

diff --git a/src/templates/nopaste/create.html b/src/templates/nopaste/create.html
index b82fcb903b05a8f79b6884b4186f0f562379b172..719ba99da9aa01d79da4c32a8db129a2d351afbf 100644 (file)
--- a/src/templates/nopaste/create.html
+++ b/src/templates/nopaste/create.html
@@ -69,7 +69,9 @@
                                </select>
                        </div>
 
-                       <button type="submit" class="btn btn-primary btn-block">{{ _("Upload") }}</button>
+                       <div class="d-grid">
+                               <button type="submit" class="btn btn-primary">{{ _("Upload") }}</button>
+                       </div>
                </form>
        </div>
 {% end block %}

diff --git a/src/templates/nopaste/view.html b/src/templates/nopaste/view.html
index 48b9b8660ac518d1550e90f927951a6cc4e0e7a4..63bef1f317d680d2777ff8b7d6691b4cff0dadb8 100644 (file)
--- a/src/templates/nopaste/view.html
+++ b/src/templates/nopaste/view.html
@@ -29,9 +29,11 @@
                        <img class="img-fluid mb-3" src="/raw/{{ entry.uuid }}">
                {% end %}
 
-               <a class="btn btn-primary btn-lg btn-block" href="/raw/{{ entry.uuid }}">
-                       <span class="fas fa-file-download"></span>
-                       {{ _("Download") }} ({{ format_size(entry.size) }})
-               </a>
+               <div class="d-grid">
+                       <a class="btn btn-primary btn-lg" href="/raw/{{ entry.uuid }}">
+                               <span class="fas fa-file-download"></span>
+                               {{ _("Download") }} ({{ format_size(entry.size) }})
+                       </a>
+               </div>
        </div>
 {% end block %}

diff --git a/src/templates/people/group.html b/src/templates/people/group.html
index 272593dbcc8cbc8da57673a08343c2cb44d43488..a31f6d664dceb532860e6790df9b0242336c1dc8 100644 (file)
--- a/src/templates/people/group.html
+++ b/src/templates/people/group.html
@@ -16,9 +16,11 @@
        <div class="container">
                {% if group.email %}
                        <section>
-                               <a class="btn btn-dark btn-block" href="mailto:{{ group.email }}">
-                                       {{ _("Email Group") }}
-                               </a>
+                               <div class="d-grid">
+                                       <a class="btn btn-dark" href="mailto:{{ group.email }}">
+                                               {{ _("Email Group") }}
+                                       </a>
+                               </div>
                        </section>
                {% end %}
 

diff --git a/src/templates/people/index.html b/src/templates/people/index.html
index bbf4ab8b9b523bd28d0a97d83bb48752b6e9182c..b0f1b2d6288db2865b446533ad8c41e48b872dc3 100644 (file)
--- a/src/templates/people/index.html
+++ b/src/templates/people/index.html
@@ -34,9 +34,11 @@
                                        <form action="/subscribe" method="POST">
                                                {% raw xsrf_form_html() %}
 
-                                               <button type="submit" class="btn btn-success btn-block">
-                                                       {{ _("Subscribe Now") }}
-                                               </button>
+                                               <div class="d-grid">
+                                                       <button type="submit" class="btn btn-success">
+                                                               {{ _("Subscribe Now") }}
+                                                       </button>
+                                               </div>
                                        </form>
                                </div>
                        </div>

diff --git a/src/templates/people/passwd.html b/src/templates/people/passwd.html
index c4c6682543a3583f9939f40be2096b05edadfa9a..aadc69f75896c3e9a867e36f9072ca11a516ecf9 100644 (file)
--- a/src/templates/people/passwd.html
+++ b/src/templates/people/passwd.html
@@ -19,7 +19,9 @@
 
                                {% module Password(account) %}
 
-                               <input class="btn btn-primary btn-block" type="submit" value="{{ _("Change Password") }}">
+                               <div class="d-grid">
+                                       <input class="btn btn-primary" type="submit" value="{{ _("Change Password") }}">
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/people/subscribed.html b/src/templates/people/subscribed.html
index 6710f8deecaa679613e087d7eea70943b982cd01..5a26825f1e73671a86b8e63c39bf2ac8c959c302 100644 (file)
--- a/src/templates/people/subscribed.html
+++ b/src/templates/people/subscribed.html
@@ -15,9 +15,11 @@
                                </div>
                        </div>
 
-                       <a class="btn btn-light btn-block" href="/">
-                               {{ _("Back") }}
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-light" href="/">
+                                       {{ _("Back") }}
+                               </a>
+                       </div>
                </div>
        </div>
 {% end block %}

diff --git a/src/templates/people/unsubscribe.html b/src/templates/people/unsubscribe.html
index 6578f58c8c0862a4072bd04d6ee979b5ad5a89c4..04a264b1508b749729c6e0511befdf6224b254de 100644 (file)
--- a/src/templates/people/unsubscribe.html
+++ b/src/templates/people/unsubscribe.html
@@ -23,17 +23,21 @@
                                        <form action="/subscribe" method="POST">
                                                {% raw xsrf_form_html() %}
 
-                                               <button type="submit" class="btn btn-success btn-block mb-3">
-                                                       {{ _("Continue Receiving Important Updates") }}
-                                               </button>
+                                               <div class="d-grid">
+                                                       <button type="submit" class="btn btn-success mb-3">
+                                                               {{ _("Continue Receiving Important Updates") }}
+                                                       </button>
+                                               </div>
                                        </form>
 
                                        <form action="/unsubscribe" method="POST">
                                                {% raw xsrf_form_html() %}
 
-                                               <button type="submit" class="btn btn-danger btn-block">
-                                                       {{ _("Unsubscribe") }}
-                                               </button>
+                                               <div class="d-grid">
+                                                       <button type="submit" class="btn btn-danger">
+                                                               {{ _("Unsubscribe") }}
+                                                       </button>
+                                               </div>
                                        </form>
                                </div>
                        </div>

diff --git a/src/templates/people/unsubscribed.html b/src/templates/people/unsubscribed.html
index c85a18061b79113a8dc78364940d8ce1a17bfc79..164f4426002b7d48e4ba7184bdc8516e963993ee 100644 (file)
--- a/src/templates/people/unsubscribed.html
+++ b/src/templates/people/unsubscribed.html
@@ -18,9 +18,11 @@
                        <form action="/subscribe" method="POST">
                                {% raw xsrf_form_html() %}
 
-                               <button type="submit" class="btn btn-success btn-block">
-                                       {{ _("Continue Receiving Important Updates") }}
-                               </button>
+                               <div class="d-grid">
+                                       <button type="submit" class="btn btn-success">
+                                               {{ _("Continue Receiving Important Updates") }}
+                                       </button>
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/people/user-edit.html b/src/templates/people/user-edit.html
index 39311eac765e85611f5a9303046d734465ee76bf..5c4d4e78944d21d2aee0a287455a2f4070276772 100644 (file)
--- a/src/templates/people/user-edit.html
+++ b/src/templates/people/user-edit.html
@@ -144,7 +144,9 @@
                                        {% end %}
                                </fieldset>
 
-                               <input class="btn btn-primary btn-block" type="submit" value="{{ _("Save") }}">
+                               <div class="d-grid">
+                                       <input class="btn btn-primary" type="submit" value="{{ _("Save") }}">
+                               </div>
                        </form>
                </section>
        </div>

diff --git a/src/templates/static/features.html b/src/templates/static/features.html
index 68dee8c79acf6f05f79fef2423e94a35c6f0139a..313ee9787c4f336a5a7058cee0c0cd0919398070 100644 (file)
--- a/src/templates/static/features.html
+++ b/src/templates/static/features.html
@@ -135,15 +135,19 @@
 
                                        <div class="row">
                                                <div class="col-12 col-md-4 mb-3">
-                                                       <a class="btn btn-secondary btn-block" href="https://wiki.ipfire.org/configuration/services/ipsec">
-                                                               VPN with IPsec
-                                                       </a>
+                                                       <div class="d-grid">
+                                                               <a class="btn btn-secondary" href="https://wiki.ipfire.org/configuration/services/ipsec">
+                                                                       VPN with IPsec
+                                                               </a>
+                                                       </div>
                                                </div>
 
                                                <div class="col-12 col-md-4 mb-3">
-                                                       <a class="btn btn-secondary btn-block" href="https://wiki.ipfire.org/configuration/services/openvpn">
-                                                               VPN with OpenVPN
-                                                       </a>
+                                                       <div class="d-grid">
+                                                               <a class="btn btn-secondary" href="https://wiki.ipfire.org/configuration/services/openvpn">
+                                                                       VPN with OpenVPN
+                                                               </a>
+                                                       </div>
                                                </div>
                                        </div>
                                </div>

diff --git a/src/templates/wiki/404.html b/src/templates/wiki/404.html
index c410a7a40cc358530b8f12dc13fce0eb8a97b169..2a873f13a96286151b4163b214c40dc419402bfd 100644 (file)
--- a/src/templates/wiki/404.html
+++ b/src/templates/wiki/404.html
@@ -17,9 +17,11 @@
                         {{ _("This wiki page does not exist, yet.") }}
                     </p>
 
-                    <a class="btn btn-primary btn-block" href="{{ os.path.join(request.path, "_edit") }}">
-                        {{ _("Create Now") }}
-                    </a>
+                                       <div class="d-grid">
+                                               <a class="btn btn-primary" href="{{ os.path.join(request.path, "_edit") }}">
+                                                       {{ _("Create Now") }}
+                                               </a>
+                                       </div>
                 </div>
             </div>
         </div>

diff --git a/src/templates/wiki/confirm-delete.html b/src/templates/wiki/confirm-delete.html
index 031b917628ba7f7a0839b705d007691c27ac709d..042a61f40f55b0d205e4f91b80176bfdf2004a09 100644 (file)
--- a/src/templates/wiki/confirm-delete.html
+++ b/src/templates/wiki/confirm-delete.html
@@ -15,9 +15,11 @@
                                <form action="" method="POST">
                                        {% raw xsrf_form_html() %}
 
-                                       <button type="submit" class="btn btn-primary btn-block">
-                                               {{ _("Delete") }}
-                                       </button>
+                                       <div class="d-grid">
+                                               <button type="submit" class="btn btn-primary">
+                                                       {{ _("Delete") }}
+                                               </button>
+                                       </div>
                                </form>
                        </div>
                </div>

diff --git a/src/templates/wiki/confirm-restore.html b/src/templates/wiki/confirm-restore.html
index 5fce19f1b3b48f3af4d375733db553862b82f16c..d4c792b8963ea552bd4ef45f3d24d7f55d3c3451 100644 (file)
--- a/src/templates/wiki/confirm-restore.html
+++ b/src/templates/wiki/confirm-restore.html
@@ -23,9 +23,11 @@
                                                        placeholder="{{ _("Comment") }}">
                                        </div>
 
-                                       <button type="submit" class="btn btn-warning btn-block">
-                                               {{ _("Restore") }}
-                                       </button>
+                                       <div class="d-grid">
+                                               <button type="submit" class="btn btn-warning">
+                                                       {{ _("Restore") }}
+                                               </button>
+                                       </div>
                                </form>
                        </div>
                </div>

diff --git a/src/templates/wiki/edit.html b/src/templates/wiki/edit.html
index 4f727fd77aa87564b263c81b6d2f1173c5480757..f474f0166fc8c1cea2083bd744fc5dc33e4981f7 100644 (file)
--- a/src/templates/wiki/edit.html
+++ b/src/templates/wiki/edit.html
@@ -89,9 +89,11 @@
                                        </div>
                                {% end %}
 
-                               <button type="submit" class="btn btn-primary btn-block">
-                                       {% if page %}{{ _("Save Page") }}{% else %}{{ _("Create Page") }}{% end %}
-                               </button>
+                               <div class="d-grid">
+                                       <button type="submit" class="btn btn-primary">
+                                               {% if page %}{{ _("Save Page") }}{% else %}{{ _("Create Page") }}{% end %}
+                                       </button>
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/wiki/files/detail.html b/src/templates/wiki/files/detail.html
index a1c55f707daff387c091ae09ddb27a3822a43875..9527cdae89012696d3bc02ef7d0f1299577f3b43 100644 (file)
--- a/src/templates/wiki/files/detail.html
+++ b/src/templates/wiki/files/detail.html
@@ -21,10 +21,12 @@
                                </object>
                        {% end %}
 
-                       <a class="btn btn-primary btn-lg btn-block my-3" href="{{ file.url }}?revision={{ file.created_at.isoformat() }}">
-                               <span class="fas fa-file-download"></span>
-                               {{ _("Download") }} ({{ format_size(file.size) }})
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-primary btn-lg my-3" href="{{ file.url }}?revision={{ file.created_at.isoformat() }}">
+                                       <span class="fas fa-file-download"></span>
+                                       {{ _("Download") }} ({{ format_size(file.size) }})
+                               </a>
+                       </div>
 
                        {% if file.is_image() %}
                                <h6>{{ _("Usage") }}</h6>
@@ -76,9 +78,11 @@
 
                        <h6>{{ _("Delete") }}</h6>
 
-                       <a class="btn btn-danger btn-block mb-5" href="{{ file.url }}/_delete">
-                               {{ _("Delete") }}
-                       </a>
+                       <div class="d-grid">
+                               <a class="btn btn-danger mb-5" href="{{ file.url }}/_delete">
+                                       {{ _("Delete") }}
+                               </a>
+                       </div>
 
                        <h6>{{ _("Upload Newer Revision") }}</h6>
 
@@ -97,7 +101,9 @@
                                        </small>
                                </div>
 
-                               <input class="btn btn-primary btn-block" type="submit" value="{{ _("Upload") }}">
+                               <div class="d-grid">
+                                       <input class="btn btn-primary" type="submit" value="{{ _("Upload") }}">
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/wiki/files/index.html b/src/templates/wiki/files/index.html
index 5565c365d61ed4a67e2557763f9e9506910aa94c..bc6f99bb63615ec4502a87211dcd21eb7b994b8c 100644 (file)
--- a/src/templates/wiki/files/index.html
+++ b/src/templates/wiki/files/index.html
@@ -64,7 +64,9 @@
                                        <label class="form-label" for="customFile">{{ _("Choose a file to upload") }}</label>
                                </div>
 
-                               <input class="btn btn-primary btn-block" type="submit" value="{{ _("Upload") }}">
+                               <div class="d-grid">
+                                       <input class="btn btn-primary" type="submit" value="{{ _("Upload") }}">
+                               </div>
                        </form>
                </div>
        </div>

diff --git a/src/templates/wiki/page.html b/src/templates/wiki/page.html
index ebcd5520791fe6543b2f60239dde28b1ce494c7d..9edd25387e0a873507ad57ad0fea74fd776e56e1 100644 (file)
--- a/src/templates/wiki/page.html
+++ b/src/templates/wiki/page.html
@@ -36,10 +36,12 @@
                </div>
        </div>
 
-       <a class="btn btn-primary btn-block mb-3" href="{{ os.path.join(request.path, "_edit") }}">
-               <span class="fas fa-edit mr-2"></span> {{ _("Edit Page") }}
-               {% if not current_user %}&dash; {{ _("Yes, you can edit!") }}{% end %}
-       </a>
+       <div class="d-grid">
+               <a class="btn btn-primary mb-3" href="{{ os.path.join(request.path, "_edit") }}">
+                       <span class="fas fa-edit mr-2"></span> {{ _("Edit Page") }}
+                       {% if not current_user %}&dash; {{ _("Yes, you can edit!") }}{% end %}
+               </a>
+       </div>
 
        <p class="small text-muted">
                {% if current_user %}