diff --git a/app/javascript/src/styles/base/020_base.scss b/app/javascript/src/styles/base/020_base.scss index 50aff74b2..788bb0bfe 100644 --- a/app/javascript/src/styles/base/020_base.scss +++ b/app/javascript/src/styles/base/020_base.scss @@ -128,6 +128,13 @@ table tfoot { max-width: 70em; } +.column-container { + display: flex; + + .column-expand { flex: 1; } + .column-shrink { flex: 0; } +} + ul.list-bulleted { list-style: inside disc; } diff --git a/app/javascript/src/styles/common/main_layout.scss b/app/javascript/src/styles/common/main_layout.scss index f6ea112ce..832a140fb 100644 --- a/app/javascript/src/styles/common/main_layout.scss +++ b/app/javascript/src/styles/common/main_layout.scss @@ -25,7 +25,6 @@ div#page { } footer#page-footer { - clear: both; width: 100%; margin-top: 1em; text-align: center; @@ -33,10 +32,6 @@ footer#page-footer { border-top: var(--footer-border); } -div.clearfix { - clear: both; -} - .sidebar-container { display: flex; diff --git a/app/javascript/src/styles/common/paginator.scss b/app/javascript/src/styles/common/paginator.scss index 9858c356a..beee65534 100644 --- a/app/javascript/src/styles/common/paginator.scss +++ b/app/javascript/src/styles/common/paginator.scss @@ -2,7 +2,6 @@ div.paginator { display: block; padding: 2em 0 1em 0; text-align: center; - clear: both; li { a { diff --git a/app/javascript/src/styles/specific/keyboard_shortcuts.scss b/app/javascript/src/styles/specific/keyboard_shortcuts.scss index aede2d667..ccca8add4 100644 --- a/app/javascript/src/styles/specific/keyboard_shortcuts.scss +++ b/app/javascript/src/styles/specific/keyboard_shortcuts.scss @@ -1,16 +1,10 @@ -@import "../base/000_vars.scss"; - div#c-static { div#a-keyboard-shortcuts { - overflow: visible; + section.column { + min-width: 25em; - section { - min-width: 20%; - float: left; - margin-bottom: 1em; - - h1 { - font-size: $h3_size; + ul { + margin-bottom: 2em; } li { diff --git a/app/javascript/src/styles/specific/moderator_dashboard.scss b/app/javascript/src/styles/specific/moderator_dashboard.scss index 774464738..12871c469 100644 --- a/app/javascript/src/styles/specific/moderator_dashboard.scss +++ b/app/javascript/src/styles/specific/moderator_dashboard.scss @@ -1,13 +1,6 @@ div#c-moderator-dashboards { - div#col1 { - width: 45%; - float: left; - padding-right: 5%; - } - - div#col2 { - width: 45%; - float: left; + #column-left { + margin-right: 2em; } div.activity { diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss index 29c9fcb49..84ee0833c 100644 --- a/app/javascript/src/styles/specific/posts.scss +++ b/app/javascript/src/styles/specific/posts.scss @@ -331,10 +331,6 @@ div#c-posts { margin: 1em 0 0.5em; } - span.quick-mod { - float: right; - } - .pool-name, .search-name { word-wrap: break-word; } diff --git a/app/javascript/src/styles/specific/users.scss b/app/javascript/src/styles/specific/users.scss index 90a455a4e..cfa0c5579 100644 --- a/app/javascript/src/styles/specific/users.scss +++ b/app/javascript/src/styles/specific/users.scss @@ -4,16 +4,6 @@ div#c-users { margin-bottom: 2em; } - /* clearfix hacks */ - div.box:before, div.box:after { - content: ""; - display: table; - } - - div.box:after { - clear: both; - } - table.user-statistics { tr { height: 1.75em; diff --git a/app/javascript/src/styles/specific/z_responsive.scss b/app/javascript/src/styles/specific/z_responsive.scss index 12ee4287d..e775572a5 100644 --- a/app/javascript/src/styles/specific/z_responsive.scss +++ b/app/javascript/src/styles/specific/z_responsive.scss @@ -77,7 +77,6 @@ } article.post-preview { - float: none; margin: 0; text-align: center; vertical-align: middle; diff --git a/app/views/explore/posts/intro.html.erb b/app/views/explore/posts/intro.html.erb index 885babbbc..2f33b86da 100644 --- a/app/views/explore/posts/intro.html.erb +++ b/app/views/explore/posts/intro.html.erb @@ -17,7 +17,6 @@

<%= link_to tag, posts_path(:tags => tag) %>

<%= post_set.presenter.post_previews_html(self, show_cropped: true) %> -
<% end %> <% end %> diff --git a/app/views/moderator/dashboards/show.html.erb b/app/views/moderator/dashboards/show.html.erb index 835b1021d..6c3c3361e 100644 --- a/app/views/moderator/dashboards/show.html.erb +++ b/app/views/moderator/dashboards/show.html.erb @@ -5,20 +5,22 @@ <%= render "search" %> <%= render "posts/partials/common/inline_blacklist" %> -
-
<%= render "activity_upload" %>
-
<%= render "activity_note" %>
-
<%= render "activity_tag" %>
-
<%= render "activity_wiki_page" %>
-
<%= render "activity_artist" %>
-
<%= render "activity_comment" %>
-
+
+
+
<%= render "activity_upload" %>
+
<%= render "activity_note" %>
+
<%= render "activity_tag" %>
+
<%= render "activity_wiki_page" %>
+
<%= render "activity_artist" %>
+
<%= render "activity_comment" %>
+
-
-
<%= render "activity_appeal" %>
-
<%= render "activity_user_feedback" %>
-
<%= render "activity_mod_action" %>
-
+
+
<%= render "activity_appeal" %>
+
<%= render "activity_user_feedback" %>
+
<%= render "activity_mod_action" %>
+
+
diff --git a/app/views/static/keyboard_shortcuts.html.erb b/app/views/static/keyboard_shortcuts.html.erb index c4702cf2e..794ee6a1b 100644 --- a/app/views/static/keyboard_shortcuts.html.erb +++ b/app/views/static/keyboard_shortcuts.html.erb @@ -2,66 +2,68 @@

Keyboard Shortcuts

-
-

Listing

- -
+
+
+

Listing

+
    +
  • a, ⇦ Previous page
    • +
  • d, ⇨ Next page
    • +
  • q Search
    • +
  • w Scroll up
    • +
  • s Scroll down
    • +
  • r Go to random post
    • +
  • 1, 2, 3... Switch tag script
    • +
+
-
-

Post

-
    -
  • n New note
    • -
  • e Edit tags
    • -
  • shift+e Edit tags in dialog window
    • -
  • shift+o Approve post
    • -
  • enter Submit tag changes
    • -
  • q Search
    • -
  • w Scroll up
    • -
  • s Scroll down
    • -
  • a Previous post
    • -
  • d Next post
    • -
  • f Favorite post
    • -
  • shift+f Unfavorite post
    • -
  • g Add post to favorite group
    • -
  • 1, 2, 3... Add post to favorite group #N
    • -
  • v Toggle between sample and full size
    • -
-
+
+

Post

+
    +
  • n New note
    • +
  • e Edit tags
    • +
  • shift+e Edit tags in dialog window
    • +
  • shift+o Approve post
    • +
  • enter Submit tag changes
    • +
  • q Search
    • +
  • w Scroll up
    • +
  • s Scroll down
    • +
  • a Previous post
    • +
  • d Next post
    • +
  • f Favorite post
    • +
  • shift+f Unfavorite post
    • +
  • g Add post to favorite group
    • +
  • 1, 2, 3... Add post to favorite group #N
    • +
  • v Toggle between sample and full size
    • +
+
-
-

Artists

-
    -
  • e Edit artist
    • -
  • shift+d Delete artist
    • -
+
+

Artists

+
    +
  • e Edit artist
    • +
  • shift+d Delete artist
    • +
-

Forum

-
    -
  • e Edit topic
    • -
  • shift+d Delete topic
    • -
  • shift+r Mark all as read
    • -
+

Forum

+
    +
  • e Edit topic
    • +
  • shift+d Delete topic
    • +
  • shift+r Mark all as read
    • +
-

Pools

-
    -
  • e Edit pool
    • -
  • shift+d Delete pool
    • -
+

Pools

+
    +
  • e Edit pool
    • +
  • shift+d Delete pool
    • +
-

Wiki

-
    -
  • e Edit wiki page
    • -
  • shift+d Delete wiki page
    • -
-
+

Wiki

+
    +
  • e Edit wiki page
    • +
  • shift+d Delete wiki page
    • +
+
+