From fe51f7a863b68abfe592d564b0e96c3f65e66415 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu <dan@ungureanu.me> Date: Thu, 30 Apr 2020 12:07:51 +0300 Subject: [PATCH] FEATURE: More improvements to crawler and old browsers view Related to c85018cdfd1a36e8c33de25c44bf192d53e201c1. --- app/assets/javascripts/polyfills.js | 2 +- app/assets/stylesheets/common/base/_topic-list.scss | 6 ------ app/assets/stylesheets/common/base/crawler_layout.scss | 8 ++++---- app/views/list/list.erb | 8 +++++--- app/views/topics/show.html.erb | 2 +- config/locales/client.en.yml | 2 +- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js index 358a2134672..0fe25c8bdbc 100644 --- a/app/assets/javascripts/polyfills.js +++ b/app/assets/javascripts/polyfills.js @@ -1,6 +1,6 @@ /* eslint-disable */ -// Any IE only polyfill should be moved in discourse-internet-explorer plugin +// Any IE only polyfill should be moved in discourse-unsupported-browser plugin // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/flags#Polyfill // IE and EDGE diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index 01fc70a2bb2..5b9cff00763 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -142,12 +142,6 @@ } } - .link-bottom-line { - .category-name { - margin-right: 12px; - } - } - .unread-indicator { &.read { display: none; diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss index c0ca9315100..b0588f35b58 100644 --- a/app/assets/stylesheets/common/base/crawler_layout.scss +++ b/app/assets/stylesheets/common/base/crawler_layout.scss @@ -11,6 +11,10 @@ body.crawler { box-sizing: border-box; } + .header-buttons { + display: none; + } + div#main-outlet { div.post { word-break: break-word; @@ -29,10 +33,6 @@ body.crawler { margin-top: 4em; } - .category-title { - color: $primary; - } - .discourse-tags { color: $primary-medium; } diff --git a/app/views/list/list.erb b/app/views/list/list.erb index 77bb68d2e4e..9fa5a1f034a 100644 --- a/app/views/list/list.erb +++ b/app/views/list/list.erb @@ -69,7 +69,9 @@ <% if (!@category || @category.has_children?) && t.category %> <a href='<%= t.category.url %>' class='badge-wrapper bullet'> <span class='badge-category-bg' style='background-color: #<%= t.category.color %>'></span> - <span class='category-title'><%= t.category.name %></span> + <span class='badge-category clear-badge'> + <span class='category-name'><%= t.category.name %></span> + </span> </a> <% end %> <% if t.tags %> @@ -99,10 +101,10 @@ <% end %> </td> <td> - <span class='views' title='<%= t 'views' %>'><%= t.views %></span> + <span class='posts' title='<%= t 'posts' %>'><%= t.posts_count %></span> </td> <td> - <span class='posts' title='<%= t 'posts' %>'><%= t.posts_count %></span> + <span class='views' title='<%= t 'views' %>'><%= t.views %></span> </td> <td> <%= I18n.l(t.last_posted_at || t.created_at, format: :date_only) %> diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index e9d3b96b9a1..801e0a09730 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -11,7 +11,7 @@ <span itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"> <a href="<%= Discourse.base_url %><%= c[:url] %>" class="badge-wrapper bullet" itemprop="item"> <span class="badge-category-bg" style='background-color: #<%= c[:color] %>'></span> - <span class="category-title" itemprop="name"><%= c[:name] %></span> + <span class="category-name" itemprop="name"><%= c[:name] %></span> </a> <meta itemprop="position" content="<%= i + 1 %>" /> </span> diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index da09ba9c9eb..61a29cb70ef 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -3052,7 +3052,7 @@ en: today: "Today" other_periods: "see top" - browser_update: 'Unfortunately, <a href="https://www.discourse.org/faq/#browser">your browser is too old to work on this site</a>. Please <a href="https://browsehappy.com">upgrade your browser</a>.' + browser_update: 'Unfortunately, <a href="https://www.discourse.org/faq/#browser">your browser is too old to work on this site</a>. Please <a href="https://browsehappy.com">upgrade your browser</a> to view rich content, login, and reply.' permission_types: full: "Create / Reply / See"