From 77d22605760beca7c51cb8999c4d6f9ee626fb50 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 23 Sep 2019 19:06:34 -0500
Subject: [PATCH] css: clean up <ul> css.

* Remove `list-style-type: none` rules (this is the default).
* Add `list-bulleted` and `list-inline` utility classes.
* Wrap terms of service and user deletion pages in dtext `.prose` class
  so we don't have to redefine basic list styles on these pages.
---
 app/javascript/src/styles/base/020_base.scss  | 11 ++++++++-
 .../src/styles/common/blacklists.scss         |  3 ---
 .../src/styles/common/main_layout.scss        |  4 ----
 app/javascript/src/styles/common/news.scss    |  1 -
 app/javascript/src/styles/specific/error.scss |  1 -
 app/javascript/src/styles/specific/pools.scss |  8 -------
 app/javascript/src/styles/specific/posts.scss |  8 -------
 .../src/styles/specific/terms_of_service.scss | 24 -------------------
 .../src/styles/specific/user_deletions.scss   | 10 --------
 .../maintenance/user/deletions/show.html.erb  |  2 +-
 app/views/pools/_inline_list.html.erb         |  2 +-
 app/views/post_appeals/_reasons.html.erb      |  2 +-
 app/views/post_flags/_reasons.html.erb        |  2 +-
 .../posts/partials/index/_blacklist.html.erb  |  3 +--
 app/views/static/terms_of_service.html.erb    |  8 +++----
 15 files changed, 19 insertions(+), 70 deletions(-)
 delete mode 100644 app/javascript/src/styles/specific/terms_of_service.scss
 delete mode 100644 app/javascript/src/styles/specific/user_deletions.scss

diff --git a/app/javascript/src/styles/base/020_base.scss b/app/javascript/src/styles/base/020_base.scss
index 9d98a634b..535055d70 100644
--- a/app/javascript/src/styles/base/020_base.scss
+++ b/app/javascript/src/styles/base/020_base.scss
@@ -101,7 +101,6 @@ menu {
   li {
     margin: 0;
     padding: 0 0.2em;
-    list-style-type: none;
     display: inline;
   }
 }
@@ -123,3 +122,13 @@ table tfoot {
 .fixed-width-container {
   max-width: 70em;
 }
+
+ul.list-bulleted {
+  list-style: inside disc;
+}
+
+ul.list-inline {
+  &, li {
+    display: inline;
+  }
+}
diff --git a/app/javascript/src/styles/common/blacklists.scss b/app/javascript/src/styles/common/blacklists.scss
index 8096c3eb1..6cc544d4a 100644
--- a/app/javascript/src/styles/common/blacklists.scss
+++ b/app/javascript/src/styles/common/blacklists.scss
@@ -17,9 +17,6 @@
   }
 
   &.sidebar-blacklist ul li {
-    list-style-type: disc;
-    list-style-position: inside;
-
     a {
       max-width: 75%;
     }
diff --git a/app/javascript/src/styles/common/main_layout.scss b/app/javascript/src/styles/common/main_layout.scss
index ad2e4fb53..38094596c 100644
--- a/app/javascript/src/styles/common/main_layout.scss
+++ b/app/javascript/src/styles/common/main_layout.scss
@@ -13,10 +13,6 @@ div#page {
       font-size: $h3_size;
     }
 
-    ul {
-      list-style-type: none;
-    }
-
     #options-box i.fa-bookmark {
       margin-right: 0.25em;
     }
diff --git a/app/javascript/src/styles/common/news.scss b/app/javascript/src/styles/common/news.scss
index 71c5958a4..15f4840ab 100644
--- a/app/javascript/src/styles/common/news.scss
+++ b/app/javascript/src/styles/common/news.scss
@@ -12,7 +12,6 @@ div#news-updates {
   }
 
   li {
-    list-style-type: none;
     float: left;
     margin: 0 2em 0 0;
     padding: 0;
diff --git a/app/javascript/src/styles/specific/error.scss b/app/javascript/src/styles/specific/error.scss
index 849f956ed..cbd2288fc 100644
--- a/app/javascript/src/styles/specific/error.scss
+++ b/app/javascript/src/styles/specific/error.scss
@@ -1,7 +1,6 @@
 ul.backtrace {
   font-family: monospace;
   font-size: 1.2em;
-  list-style-type: none;
   background: var(--dtext-code-background);
   padding: 1em;
   margin-bottom: 1em;
diff --git a/app/javascript/src/styles/specific/pools.scss b/app/javascript/src/styles/specific/pools.scss
index cb36b5802..9ef7f703f 100644
--- a/app/javascript/src/styles/specific/pools.scss
+++ b/app/javascript/src/styles/specific/pools.scss
@@ -84,11 +84,3 @@ div#c-pool-versions {
     margin-right: 0.25em;
   }
 }
-
-ul.inline-pool-list {
-  display: inline;
-
-  li {
-    display: inline;
-  }
-}
diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss
index c946aa7ee..9f1435a27 100644
--- a/app/javascript/src/styles/specific/posts.scss
+++ b/app/javascript/src/styles/specific/posts.scss
@@ -237,10 +237,6 @@ div#c-posts {
     overflow: hidden;
     border: var(--post-notice-border);
 
-    ul.post-flag-reasons, ul.post-appeal-reasons {
-      list-style: inside;
-    }
-
     p {
       margin-bottom: 0;
     }
@@ -269,10 +265,6 @@ div#c-posts {
     margin-bottom: 1em;
   }
 
-  aside#sidebar > section > ul li {
-    list-style-type: none;
-  }
-
   aside#sidebar > section > ul ul li {
     margin-left: 1em;
   }
diff --git a/app/javascript/src/styles/specific/terms_of_service.scss b/app/javascript/src/styles/specific/terms_of_service.scss
deleted file mode 100644
index d6b6f76d1..000000000
--- a/app/javascript/src/styles/specific/terms_of_service.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@import "../base/000_vars.scss";
-
-div#c-static div#a-terms-of-service {
-  h1 {
-    font-size: $h2_size;
-  }
-
-  p {
-    margin-bottom: 1em;
-  }
-
-  ul {
-    margin-left: 1em;
-    margin-bottom: 1em;
-  }
-
-  li {
-    list-style-type: disc;
-  }
-
-  section {
-    margin-bottom: 2em;
-  }
-}
diff --git a/app/javascript/src/styles/specific/user_deletions.scss b/app/javascript/src/styles/specific/user_deletions.scss
deleted file mode 100644
index b09d9c9ed..000000000
--- a/app/javascript/src/styles/specific/user_deletions.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-div#c-maintenance-user-deletions {
-  ul {
-    margin-left: 1em;
-    margin-bottom: 1em;
-  }
-
-  li {
-    list-style-type: disc;
-  }
-}
\ No newline at end of file
diff --git a/app/views/maintenance/user/deletions/show.html.erb b/app/views/maintenance/user/deletions/show.html.erb
index 507109b50..be60a7e98 100644
--- a/app/views/maintenance/user/deletions/show.html.erb
+++ b/app/views/maintenance/user/deletions/show.html.erb
@@ -1,5 +1,5 @@
 <div id="c-maintenance-user-deletions">
-  <div id="a-show">
+  <div id="a-show" class="prose">
     <h1>Delete Account</h1>
 
     <p>You can delete your account. This will not actually remove your account from the database, but it will do the following things:</p>
diff --git a/app/views/pools/_inline_list.html.erb b/app/views/pools/_inline_list.html.erb
index 73bfc7b89..487aeff56 100644
--- a/app/views/pools/_inline_list.html.erb
+++ b/app/views/pools/_inline_list.html.erb
@@ -1,4 +1,4 @@
-<ul class="inline-pool-list">
+<ul class="list-inline">
   <% pools.each do |pool| %>
     <li><%= link_to pool.pretty_name, pool, :class => "pool-category-#{pool.category}" %></li>
   <% end %>
diff --git a/app/views/post_appeals/_reasons.html.erb b/app/views/post_appeals/_reasons.html.erb
index d5656d5f7..4bfdafb74 100644
--- a/app/views/post_appeals/_reasons.html.erb
+++ b/app/views/post_appeals/_reasons.html.erb
@@ -1,4 +1,4 @@
-<ul class="post-appeal-reasons">
+<ul class="post-appeal-reasons list-bulleted">
   <% appeals.each do |appeal| %>
     <li class="post-appeal-reason">
       <span class="prose"><%= format_text(appeal.reason, inline: true) %></span>
diff --git a/app/views/post_flags/_reasons.html.erb b/app/views/post_flags/_reasons.html.erb
index 3acfbd867..df0c20859 100644
--- a/app/views/post_flags/_reasons.html.erb
+++ b/app/views/post_flags/_reasons.html.erb
@@ -1,4 +1,4 @@
-<ul class="post-flag-reasons">
+<ul class="post-flag-reasons list-bulleted">
   <% flags.each do |flag| %>
     <li class="post-flag-reason">
       <span class="prose"><%= format_text(flag.reason, inline: true) %></span>
diff --git a/app/views/posts/partials/index/_blacklist.html.erb b/app/views/posts/partials/index/_blacklist.html.erb
index a4762f2e3..c3e31625e 100644
--- a/app/views/posts/partials/index/_blacklist.html.erb
+++ b/app/views/posts/partials/index/_blacklist.html.erb
@@ -1,7 +1,6 @@
 <div id="blacklist-box" class="sidebar-blacklist">
   <h1>Blacklisted (<%= link_to "help", wiki_pages_path(:title => "help:blacklists") %>)</h1>
-  <ul id="blacklist-list">
-  </ul>
+  <ul id="blacklist-list" class="list-bulleted"></ul>
   <%= link_to "Disable all", "#", :id => "disable-all-blacklists", :style => "display: none;" %>
   <%= link_to "Re-enable all", "#", :id => "re-enable-all-blacklists", :style => "display: none;" %>
 </div>
diff --git a/app/views/static/terms_of_service.html.erb b/app/views/static/terms_of_service.html.erb
index 9954bbfdc..613e4ed13 100644
--- a/app/views/static/terms_of_service.html.erb
+++ b/app/views/static/terms_of_service.html.erb
@@ -1,5 +1,5 @@
 <div id="c-static">
-  <div id="a-terms-of-service" class="fixed-width-container">
+  <div id="a-terms-of-service" class="prose fixed-width-container">
     <h1>Rules</h1>
     
     <p>Please read the following before using the site:</p>
@@ -43,7 +43,7 @@
     </div>
 
     <div class="section">
-      <h4>Copyright Infringement</h4>
+      <h6>Copyright Infringement</h6>
 
       <p>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:</p>
       <ul>
@@ -53,14 +53,14 @@
     </div>
 
     <div class="section">
-      <h4>Privacy Policy</h4>
+      <h6>Privacy Policy</h6>
 
       <p>Danbooru will not disclose the IP address, email address, password, or DMails of any user except to the staff.</p>
       <p>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.</p>
     </div>
 
     <div class="section">
-      <h4>Accounts</h4>
+      <h6>Accounts</h6>
 
       <p>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.</p>
       <p>Account sharing is not permitted. If you are suspected of sharing an account, then it will be banned.</p>