diff --git a/app/assets/stylesheets/articles.scss b/app/assets/stylesheets/articles.scss index 8216ca76e..077d77a81 100644 --- a/app/assets/stylesheets/articles.scss +++ b/app/assets/stylesheets/articles.scss @@ -199,7 +199,7 @@ margin-bottom:calc(-1px - 0.6vw); display: flex; .article-organization-headline-inner { - background: darken($light-gray, 7%); + background: darken($light-gray, 6%); color: $black; padding: 6px 12px; border-radius: 100px; diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 2c49b176f..37ad66112 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -132,6 +132,25 @@ border-radius:3px; position:relative; background: white; + &.single-article-unpublished { + background: lighten($yellow, 20%); + } + .dashboard-collection-org-details { + .dashboard-top-pill { + background: darken($light-gray, 6%); + margin-right: 5px; + padding: 3px 10px; + border-radius: 100px; + margin-top: 10px; + display: inline-block; + font-size: 0.9em; + } + } + .dashboard-meta-details{ + font-size: 0.85em; + padding: 3px 0px 6px; + color: $medium-gray; + } a{ color: $black; &.block-link{ @@ -165,18 +184,20 @@ color:rgb(67, 78, 87); } .dashboard-actions{ - padding: 5px 0px; + padding: 7px 0px 10px; } .pill{ background:$bold-blue; - padding:2px 14px; - border-radius:3px; + padding:4px 20px; + border-radius:100px; color:white; margin-right:5px; - font-size:13px; + font-size:14px; + border: 2px solid transparent; &.yellow{ background:$yellow; color:$black; + border: 2px solid $black; } &.green{ background: $green; diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb index b5cf9cda6..92c470239 100644 --- a/app/controllers/dashboards_controller.rb +++ b/app/controllers/dashboards_controller.rb @@ -27,4 +27,4 @@ class DashboardsController < ApplicationController # Updates analytics in background if appropriate: ArticleAnalyticsFetcher.new.delay.update_analytics(current_user.id) if @articles end -end \ No newline at end of file +end diff --git a/app/views/dashboards/_dashboard_article.html.erb b/app/views/dashboards/_dashboard_article.html.erb index c7cf221ae..6a6b45d29 100644 --- a/app/views/dashboards/_dashboard_article.html.erb +++ b/app/views/dashboards/_dashboard_article.html.erb @@ -1,12 +1,28 @@ -
+
"> +
+ <% if article.organization_id %> + <%= article.organization&.name %> + <% end %> + <% if article.collection_id %> + Series: <%= article.series %> + <% end %> +

<%= article.title %>

+
+ <% if article.published %> + <%= article.readable_publish_date %> + <% article.cached_tag_list_array.each do |tag| %> + #<%= tag %> + <% end %> + <% end %> +
<% if !article.published %> - DRAFT + DRAFT <% end %> EDIT DELETE - <% if article.published && current_user.can_view_analytics? %> + <% if article.published %> <%= article.page_views_count > 100 ? article.page_views_count : "under 100" %> views // <%= article.positive_reactions_count %> reactions // <%= article.comments_count %> comments