From 0d67ddfcd52e2cefd46d854988a7a1578f006abd Mon Sep 17 00:00:00 2001 From: alice Date: Tue, 14 Sep 2021 18:39:23 +0200 Subject: [PATCH] fix .button and use for all buttons --- static/css/style.css | 40 ++++++++++++------- templates/ccvpn/require_email.html | 2 +- templates/ccvpn/signup.html | 2 +- templates/lambdainst/account.html | 6 +-- templates/lambdainst/config.html | 2 +- templates/lambdainst/settings.html | 8 ++-- templates/lambdainst/wireguard.html | 8 ++-- templates/lambdainst/wireguard_new.html | 2 +- templates/payments/cancel_subscr.html | 2 +- templates/registration/login.html | 2 +- .../registration/password_reset_confirm.html | 2 +- .../registration/password_reset_form.html | 2 +- templates/tickets/index.html | 2 +- templates/tickets/new.html | 2 +- templates/tickets/view.html | 6 +-- 15 files changed, 49 insertions(+), 39 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index b457449..2e8f3cd 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -73,25 +73,29 @@ div#captcha > div { border-radius: 3px; padding: 0.5em 1em; - border: 2px solid #1c619a; + border: 0; + + color: #fff; + background: #1c619a; } .button.thin { - border-width: 1px; + color: #005188; + background: transparent; + border: 1px solid #1c619a; padding: 0.15em 0.50em; - border-radius: 7px; + border-radius: 9px; font-size: 0.85em; } - -.button, .button.inverted:hover { - color: #1c619a; - color: #005188; - background: transparent; +.button:hover { + color: #fff; + background: #005188; } -.button:hover, .button.inverted { +.button.thin:hover { color: #fff; background: #1c619a; } + /***************************************************/ /********************* Header */ @@ -521,6 +525,10 @@ a.pure-button-primary, a.pure-button-selected { .button-danger { background-color: #A7332F; } +.button-danger:hover { + background-color: #972925; + +} form p.inputinfo { font-size: 0.8em; @@ -1292,19 +1300,21 @@ div.ticket-message-private { fill: #1c619a; } - .button { - border: 2px solid #35b8ff; + .button.thin { + border: 1px solid #35b8ff; + color: #35b8ff; } - .button:hover { + .button.thin:hover { background: #35b8ff; color: #000; } - .button.inverted { - border: 2px solid #1c619a; + a.button { + color: #fff; + } + .button.inverted { } .button, .button.inverted:hover { - color: #35b8ff; } .pure-form input[type="text"], .pure-form input[type="password"], .pure-form input[type="email"], .pure-form input[type="url"], .pure-form input[type="date"], .pure-form input[type="month"], .pure-form input[type="time"], .pure-form input[type="datetime"], .pure-form input[type="datetime-local"], .pure-form input[type="week"], .pure-form input[type="number"], .pure-form input[type="search"], .pure-form input[type="tel"], .pure-form input[type="color"], .pure-form select, .pure-form textarea, diff --git a/templates/ccvpn/require_email.html b/templates/ccvpn/require_email.html index f1f392a..e965991 100644 --- a/templates/ccvpn/require_email.html +++ b/templates/ccvpn/require_email.html @@ -16,7 +16,7 @@ {% trans 'Required to use the forums. A confirmation will be sent.' %}

- + diff --git a/templates/ccvpn/signup.html b/templates/ccvpn/signup.html index 0052d6c..f3b4712 100644 --- a/templates/ccvpn/signup.html +++ b/templates/ccvpn/signup.html @@ -39,7 +39,7 @@ {% endif %} - +
-

{% trans 'You can cancel the recurring payment at any time.' %}

@@ -132,7 +132,7 @@
-

{% trans 'If you still have time, the first payment will be delayed.' %}

@@ -154,7 +154,7 @@ pattern="[ ]*[a-zA-Z0-9]{1,32}[ ]*" autocomplete="off" />
-

{% trans 'Our coupons are alphanumeric codes that give you a fixed duration of VPN access.' %}
diff --git a/templates/lambdainst/config.html b/templates/lambdainst/config.html index b2796c7..56a42ef 100644 --- a/templates/lambdainst/config.html +++ b/templates/lambdainst/config.html @@ -55,7 +55,7 @@ {% trans 'Enable IPv6?' %} - diff --git a/templates/lambdainst/settings.html b/templates/lambdainst/settings.html index d90690f..99bfcb5 100644 --- a/templates/lambdainst/settings.html +++ b/templates/lambdainst/settings.html @@ -25,7 +25,7 @@

- +
@@ -53,7 +53,7 @@
- +
@@ -76,7 +76,7 @@

- +

{% blocktrans trimmed %} @@ -107,7 +107,7 @@

- +
{% endif %} diff --git a/templates/lambdainst/wireguard.html b/templates/lambdainst/wireguard.html index 1f8923a..082e1b1 100644 --- a/templates/lambdainst/wireguard.html +++ b/templates/lambdainst/wireguard.html @@ -27,7 +27,7 @@ {% else %} href="{% url 'lambdainst:wireguard_new' %}" {% endif %} - class="pure-button pure-button-primary" + class="button inverted" > {% trans "New Device" %} @@ -36,7 +36,7 @@ {% if keys %} - +
@@ -125,10 +125,10 @@ {% trans 'Enable IPv6?' %} - - diff --git a/templates/lambdainst/wireguard_new.html b/templates/lambdainst/wireguard_new.html index eb74638..eb63c78 100644 --- a/templates/lambdainst/wireguard_new.html +++ b/templates/lambdainst/wireguard_new.html @@ -31,7 +31,7 @@
-
diff --git a/templates/payments/cancel_subscr.html b/templates/payments/cancel_subscr.html index c211f47..53dafcb 100644 --- a/templates/payments/cancel_subscr.html +++ b/templates/payments/cancel_subscr.html @@ -18,7 +18,7 @@
-
diff --git a/templates/registration/login.html b/templates/registration/login.html index 88429d4..b7eddcf 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -10,7 +10,7 @@ {% csrf_token %} {{ form.as_p }} - +
{% trans "Public Key" %}