diff --git a/app/javascript/src/styles/base/020_base.scss b/app/javascript/src/styles/base/020_base.scss index e8a537220..9d98a634b 100644 --- a/app/javascript/src/styles/base/020_base.scss +++ b/app/javascript/src/styles/base/020_base.scss @@ -119,3 +119,7 @@ table tfoot { font-style: italic; font-size: 0.8em; } + +.fixed-width-container { + max-width: 70em; +} diff --git a/app/javascript/src/styles/specific/maintenance.scss b/app/javascript/src/styles/specific/maintenance.scss deleted file mode 100644 index 196cbe2c7..000000000 --- a/app/javascript/src/styles/specific/maintenance.scss +++ /dev/null @@ -1,5 +0,0 @@ -div#c-maintenance-user-login-reminders { - div#a-new { - width: 50em; - } -} \ No newline at end of file diff --git a/app/javascript/src/styles/specific/site_map.scss b/app/javascript/src/styles/specific/site_map.scss index 79f870c47..cd015c5d1 100644 --- a/app/javascript/src/styles/specific/site_map.scss +++ b/app/javascript/src/styles/specific/site_map.scss @@ -2,11 +2,10 @@ div#c-static { div#a-site-map { - width: 80em; + display: flex; section { - width: 20em; - float: left; + flex: 1; h1 { font-size: $h3_size; diff --git a/app/javascript/src/styles/specific/tags.scss b/app/javascript/src/styles/specific/tags.scss index 6328a5e77..a441e8a1a 100644 --- a/app/javascript/src/styles/specific/tags.scss +++ b/app/javascript/src/styles/specific/tags.scss @@ -13,8 +13,6 @@ div#c-tags { } #tags-container { - max-width: 70em; - div.header { margin: 0; display: grid; diff --git a/app/javascript/src/styles/specific/terms_of_service.scss b/app/javascript/src/styles/specific/terms_of_service.scss index aca31eb42..d6b6f76d1 100644 --- a/app/javascript/src/styles/specific/terms_of_service.scss +++ b/app/javascript/src/styles/specific/terms_of_service.scss @@ -1,8 +1,6 @@ @import "../base/000_vars.scss"; div#c-static div#a-terms-of-service { - width: 40em; - h1 { font-size: $h2_size; } diff --git a/app/javascript/src/styles/specific/user_feedback.scss b/app/javascript/src/styles/specific/user_feedback.scss index 3c165aa2b..bbaa86e52 100644 --- a/app/javascript/src/styles/specific/user_feedback.scss +++ b/app/javascript/src/styles/specific/user_feedback.scss @@ -6,9 +6,4 @@ div#c-user-feedbacks, div#c-moderator-dashboards div#col2 { .feedback-category-negative { background: var(--error-background-color); } - - #negative-policy { - max-width: 50em; - margin-bottom: 1em; - } } diff --git a/app/javascript/src/styles/specific/user_upgrades.scss b/app/javascript/src/styles/specific/user_upgrades.scss index 40856af45..7c9727b27 100644 --- a/app/javascript/src/styles/specific/user_upgrades.scss +++ b/app/javascript/src/styles/specific/user_upgrades.scss @@ -1,8 +1,5 @@ div#c-user-upgrades { div#a-new { - max-width: 40em; - font-size: 1.2em; - form.stripe { display: inline; } diff --git a/app/javascript/src/styles/specific/users.scss b/app/javascript/src/styles/specific/users.scss index b525d6f38..90a455a4e 100644 --- a/app/javascript/src/styles/specific/users.scss +++ b/app/javascript/src/styles/specific/users.scss @@ -54,13 +54,4 @@ div#c-users { color: var(--text-color); } } - - div#a-new { - max-width: 60em; - - p { - font-size: 1.2em; - line-height: 1.4em; - } - } } diff --git a/app/views/maintenance/user/login_reminders/new.html.erb b/app/views/maintenance/user/login_reminders/new.html.erb index a2ac97e3b..8f4fd4e36 100644 --- a/app/views/maintenance/user/login_reminders/new.html.erb +++ b/app/views/maintenance/user/login_reminders/new.html.erb @@ -1,5 +1,5 @@
-
+

Login Reminder

If you supplied an email address when signing up, <%= Danbooru.config.app_name %> can email you your login information. Password details will not be provided and will not be changed.

diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb index 01fc5987c..12aa32a95 100644 --- a/app/views/posts/partials/show/_edit.html.erb +++ b/app/views/posts/partials/show/_edit.html.erb @@ -77,7 +77,7 @@ -
+
<%= f.label :tag_string, "Tags" %> diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb index 6bb745b3d..1894c21d0 100644 --- a/app/views/static/site_map.html.erb +++ b/app/views/static/site_map.html.erb @@ -1,5 +1,5 @@
-
+

  • Posts

    • diff --git a/app/views/static/terms_of_service.html.erb b/app/views/static/terms_of_service.html.erb index 11dc5d1ce..9954bbfdc 100644 --- a/app/views/static/terms_of_service.html.erb +++ b/app/views/static/terms_of_service.html.erb @@ -1,5 +1,5 @@
    -
    +

    Rules

    Please read the following before using the site:

    @@ -41,31 +41,30 @@
  • Nude Filter: Images that have been edited by someone other than the original creator to remove clothing or censorship. These typically feature crude drawings of breasts or genitalia laid on top of the original image.
-
-
-

Copyright Infringement

+
+

Copyright Infringement

-

If you believe a post infringes upon your copyright, please send an email to the <%= mail_to Danbooru.config.contact_email, "webmaster", :encode => "hex" %> with the following pieces of information:

-
    -
  • The URL of the infringing post.
    • -
  • Proof that you own the copyright.
    • -
-
+

If you believe a post infringes upon your copyright, please send an email to the <%= mail_to Danbooru.config.contact_email, "webmaster", :encode => "hex" %> with the following pieces of information:

+
    +
  • The URL of the infringing post.
    • +
  • Proof that you own the copyright.
    • +
+
-
-

Privacy Policy

+
+

Privacy Policy

-

Danbooru will not disclose the IP address, email address, password, or DMails of any user except to the staff.

-

Danbooru is allowed to make public everything else, including but not limited to: uploaded posts, favorited posts, comments, forum posts, wiki edits, and note edits.

-
+

Danbooru will not disclose the IP address, email address, password, or DMails of any user except to the staff.

+

Danbooru is allowed to make public everything else, including but not limited to: uploaded posts, favorited posts, comments, forum posts, wiki edits, and note edits.

+
-
-

Accounts

+
+

Accounts

-

You may have alternative accounts for bots or scripts, but if there's any suspicion you either create a new account or reuse an existing one to evade a ban or any sort of account limitation (limited uploads, loss of flagging or user feedback permissions), then all your accounts will be banned. Bot accounts that flag posts or leave user feedback are not permitted and will be banned.

-

Account sharing is not permitted. If you are suspected of sharing an account, then it will be banned.

-
+

You may have alternative accounts for bots or scripts, but if there's any suspicion you either create a new account or reuse an existing one to evade a ban or any sort of account limitation (limited uploads, loss of flagging or user feedback permissions), then all your accounts will be banned. Bot accounts that flag posts or leave user feedback are not permitted and will be banned.

+

Account sharing is not permitted. If you are suspected of sharing an account, then it will be banned.

+
<% content_for(:page_title) do %> diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index bd9007b34..7a0fcf36f 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -91,7 +91,7 @@
-
+
<%= f.label :tag_string, "Tags" %> diff --git a/app/views/user_feedbacks/new.html.erb b/app/views/user_feedbacks/new.html.erb index a6652b492..3593edbdf 100644 --- a/app/views/user_feedbacks/new.html.erb +++ b/app/views/user_feedbacks/new.html.erb @@ -1,8 +1,8 @@
-
+

New User Feedback

-
+

Before submitting negative feedback, you must make a good faith effort at communicating with the user (through DMails) to tell them what they are doing wrong. It is unfair to drop a negative record on them without warning. If you have not done this with at least two weeks of notice, the user can dispute the feedback and have it removed. You will need to provide evidence that your feedback is accurate and you gave advanced warning, so you should collect any relevant links and include them in your feedback.

Please consult <%= link_to "the guide", show_or_new_wiki_pages_path(title: "help:user_records") %> for advice on how to write constructive feedback.

diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb index 5d02474c0..a7784c5f2 100644 --- a/app/views/user_upgrades/new.html.erb +++ b/app/views/user_upgrades/new.html.erb @@ -1,5 +1,5 @@
-
+

Upgrade Account

<% unless params[:user_id] %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index ea5d9f9c1..1e1fdde0c 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,12 +1,17 @@
-
+

Sign Up

-

A basic account is free and lets you keep favorites, upload artwork, edit tags, and post comments. If you want <%= link_to "more features", new_user_upgrade_path %> you can upgrade your account later.

+

+ A basic account is free and lets you keep favorites, upload artwork, edit tags, and post + comments. If you want <%= link_to "more features", new_user_upgrade_path %> you can upgrade your account later. +

-

This site is open to web crawlers so whatever name you choose will be public!

- -

This includes favorites, uploads, and comments. Almost everything is public. So don't choose a name you don't want to be associated with.

+

+ This site is open to web crawlers, so whatever name you choose will be public. This includes + favorites, uploads, and comments. Almost everything is public. So don't choose a name you don't want to be + associated with. +

<%= simple_form_for(@user, html: {id: "signup-form"}) do |f| %>