diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 7ebad14f11..c291f31120 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -912,6 +912,10 @@ video { margin-top: 0.5rem; margin-bottom: 0.5rem; } +.my-0 { + margin-top: 0px; + margin-bottom: 0px; +} .mx-0 { margin-left: 0px; margin-right: 0px; @@ -932,10 +936,6 @@ video { margin-left: 0.5rem; margin-right: 0.5rem; } -.my-0 { - margin-top: 0px; - margin-bottom: 0px; -} .-mx-4 { margin-left: -1rem; margin-right: -1rem; @@ -1321,9 +1321,6 @@ video { .resize-y { resize: vertical; } -.resize { - resize: both; -} .list-none { list-style-type: none; } @@ -2091,10 +2088,6 @@ video { padding-top: 0px; padding-bottom: 0px; } -.px-2 { - padding-left: 0.5rem; - padding-right: 0.5rem; -} .py-4 { padding-top: 1rem; padding-bottom: 1rem; @@ -2107,6 +2100,10 @@ video { padding-top: 0.5rem; padding-bottom: 0.5rem; } +.px-2 { + padding-left: 0.5rem; + padding-right: 0.5rem; +} .px-0 { padding-left: 0px; padding-right: 0px; @@ -2170,18 +2167,15 @@ video { .pl-0 { padding-left: 0px; } -.pt-1 { - padding-top: 0.25rem; -} -.pl-2 { - padding-left: 0.5rem; -} .pr-1 { padding-right: 0.25rem; } .pl-1 { padding-left: 0.25rem; } +.pl-2 { + padding-left: 0.5rem; +} .pr-2 { padding-right: 0.5rem; } @@ -2231,7 +2225,7 @@ video { vertical-align: middle; } .font-heading { - font-family: Delius Swash Caps; + font-family: Helvetica Neue, -apple-system, BlinkMacSystemFont, Tahoma, Segoe UI, Helvetica, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol; } .font-serif { font-family: Georgia; diff --git a/files/templates/CHRISTMAS/admin/new_users.html b/files/templates/CHRISTMAS/admin/new_users.html index c4ab5a6022..5aba57e703 100644 --- a/files/templates/CHRISTMAS/admin/new_users.html +++ b/files/templates/CHRISTMAS/admin/new_users.html @@ -1,9 +1,11 @@ {% extends "CHRISTMAS/mine.html" %} {% block maincontent %} - - -{% include "CHRISTMAS/user_listing.html" %} + + +
+ {% include "CHRISTMAS/user_listing.html" %} +
{% endblock %} {% block navbar %}{% endblock %} \ No newline at end of file diff --git a/files/templates/CHRISTMAS/comments.html b/files/templates/CHRISTMAS/comments.html index b3a71dea71..c58b1ca68e 100644 --- a/files/templates/CHRISTMAS/comments.html +++ b/files/templates/CHRISTMAS/comments.html @@ -182,7 +182,7 @@ {% if c.sentto == None %}
-
  • -
  • diff --git a/files/templates/CHRISTMAS/modals/ModalSubmissionListingActions.html b/files/templates/CHRISTMAS/modals/ModalSubmissionListingActions.html index d124d5276d..288ff9eb40 100644 --- a/files/templates/CHRISTMAS/modals/ModalSubmissionListingActions.html +++ b/files/templates/CHRISTMAS/modals/ModalSubmissionListingActions.html @@ -116,7 +116,7 @@
  • -
  • diff --git a/files/templates/CHRISTMAS/settings.html b/files/templates/CHRISTMAS/settings.html index 8386059883..cd12bab139 100644 --- a/files/templates/CHRISTMAS/settings.html +++ b/files/templates/CHRISTMAS/settings.html @@ -34,11 +34,9 @@ {% block stylesheets %} - + - - - + {% if v %} diff --git a/files/templates/CHRISTMAS/shop.html b/files/templates/CHRISTMAS/shop.html index 54d7f2c38e..40542ad825 100644 --- a/files/templates/CHRISTMAS/shop.html +++ b/files/templates/CHRISTMAS/shop.html @@ -10,7 +10,7 @@

    - rDrama's Holigay Emporium + Shop

    Stir drama. Earn coins. @@ -143,13 +143,7 @@
    {% endblock %} -{% block modals %} -
    -{% include 'CHRISTMAS//awards/Christmas/Snow.html' %} -{% endblock %} - {% block scripts %} -