jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

css: clean up <ul> css.

Browse Source 
* 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.
This commit is contained in:
evazion
2019-09-23 19:06:34 -05:00
parent f4512576a4
commit 77d2260576
15 changed files with 19 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/src/styles/base/020_base.scss
View File

@@ -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;
}
}

3
app/javascript/src/styles/common/blacklists.scss
View File

@@ -17,9 +17,6 @@
}
&.sidebar-blacklist ul li {
list-style-type: disc;
list-style-position: inside;
a {
max-width: 75%;
}

4
app/javascript/src/styles/common/main_layout.scss
View File

@@ -13,10 +13,6 @@ div#page {
font-size: $h3_size;
}
ul {
list-style-type: none;
}
#options-box i.fa-bookmark {
margin-right: 0.25em;
}

1
app/javascript/src/styles/common/news.scss
View File

@@ -12,7 +12,6 @@ div#news-updates {
}
li {
list-style-type: none;
float: left;
margin: 0 2em 0 0;
padding: 0;

1
app/javascript/src/styles/specific/error.scss
View File

@@ -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;

8
app/javascript/src/styles/specific/pools.scss
View File

@@ -84,11 +84,3 @@ div#c-pool-versions {
margin-right: 0.25em;
}
}
ul.inline-pool-list {
display: inline;
li {
display: inline;
}
}

8
app/javascript/src/styles/specific/posts.scss
View File

@@ -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;
}

24
app/javascript/src/styles/specific/terms_of_service.scss
View File

@@ -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;
}
}

10
app/javascript/src/styles/specific/user_deletions.scss
View File

@@ -1,10 +0,0 @@
div#c-maintenance-user-deletions {
ul {
margin-left: 1em;
margin-bottom: 1em;
}
li {
list-style-type: disc;
}
}

2
app/views/maintenance/user/deletions/show.html.erb
View File

@@ -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>

2
app/views/pools/_inline_list.html.erb
View File

@@ -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 %>

2
app/views/post_appeals/_reasons.html.erb
View File

@@ -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>

2
app/views/post_flags/_reasons.html.erb
View File

@@ -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>

3
app/views/posts/partials/index/_blacklist.html.erb
View File

@@ -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>

8
app/views/static/terms_of_service.html.erb
View File

@@ -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>