diff --git a/app/flatpages/help/wtfpl.md b/app/flatpages/help/wtfpl.md index 418a41e2..918b52bd 100644 --- a/app/flatpages/help/wtfpl.md +++ b/app/flatpages/help/wtfpl.md @@ -1,7 +1,7 @@ title: WTFPL is a terrible license no_h1: true -
+
Please reconsider the choice of WTFPL as a license. diff --git a/app/flatpages/policy_and_guidance.md b/app/flatpages/policy_and_guidance.md index a66c771a..22735407 100644 --- a/app/flatpages/policy_and_guidance.md +++ b/app/flatpages/policy_and_guidance.md @@ -1,6 +1,6 @@ title: Package Inclusion Policy and Guidance -
+
Note: This is a draft
diff --git a/app/scss/custom.scss b/app/scss/custom.scss index 559fea88..90173050 100644 --- a/app/scss/custom.scss +++ b/app/scss/custom.scss @@ -15,6 +15,22 @@ max-height: 1em; } +#alerts { + display: block; + list-style: none; + position: fixed; + bottom: 0; + left:0; + right:0; + margin: 0; + padding:0; + z-index: 1000; +} + +#alerts li { + list-style: none; +} + .jumbotron { background-size: cover; background-repeat: no-repeat; diff --git a/app/templates/admin/list.html b/app/templates/admin/list.html index 1b7063d1..52373040 100644 --- a/app/templates/admin/list.html +++ b/app/templates/admin/list.html @@ -12,10 +12,10 @@
  • Sign in as another user
  • -
    -

    Do action

    +
    +

    Do action

    -
    + - + + +

    Enter your forum username here:

    - +

    You'll need to have the GitHub field in your forum profile @@ -56,14 +61,19 @@ Creating an Account do that here.

    - +
    +
    -
    -

    Option 2 - Paste verification token into signature

    +
    +
    +
    + Option 2 + Verification token +
    -
    + @@ -71,7 +81,7 @@ Creating an Account Enter your forum username here:

    - +

    Go to @@ -79,11 +89,12 @@ Creating an Account User Control Panel > Profile > Edit signature

    +

    Paste this into your signature:

    - +

    Click next so we can check it. @@ -92,15 +103,20 @@ Creating an Account Don't worry, you can remove it after this is done.

    - +
    +
    -
    -

    Option 3 - Email/password sign up

    +
    +
    +
    + Option 3 + Email/password sign up +
    -
    -

    +

    +

    Only do this if you don't have a forum account!

    @@ -108,8 +124,10 @@ Creating an Account options.

    - Register + Register
    +
    +
    {% endif %} {% endblock %} diff --git a/app/templates/users/set_password.html b/app/templates/users/set_password.html index 6fe88e90..3fb7b26b 100644 --- a/app/templates/users/set_password.html +++ b/app/templates/users/set_password.html @@ -7,7 +7,7 @@ {% block content %} {% if optional %} -
    +
    It is recommended that you set a password for your account. Skip