Replace site-icon sass mixin with native css

Earlopain · Oct 18, 2023 · 50c697c · 50c697c
1 parent 5b125bf
commit 50c697c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/app/helpers/artist_url_helper.rb b/app/helpers/artist_url_helper.rb
@@ -13,11 +13,13 @@ def site_types_collection
     Sites.definitions.map { |definition| [definition.display_name, definition.site_type] }.sort
   end
 
-  def site_icon(artist_url)
+  def site_icon(artist_url, &)
     # NOTE: Would be neat to be able to use attr here but no browser supports this at the moment
     icon_index = ArtistUrl.site_types[artist_url.site_type]
     icon = tag.span(class: "site-icon", style: "--icon-index: #{icon_index};")
-    link_to tag.span(icon), gallery_url(artist_url), title: "#{artist_url.site.display_name} - #{artist_url.unescaped_url_identifier}"
+    icon_link = link_to(icon, gallery_url(artist_url), title: "#{artist_url.site.display_name} - #{artist_url.unescaped_url_identifier}")
+    text = tag.span(capture(&), class: "site-icon-text") if block_given?
+    tag.span(icon_link + text, class: "site-icon-wrapper")
   end
 
   def ordered_artist_urls(artist)

diff --git a/app/stylesheet/base/mixins.scss b/app/stylesheet/base/mixins.scss
@@ -1,5 +1,6 @@
-@mixin site_icon($icon_size) {
-  font-size: $icon_size;
+.site-icon-wrapper {
+  --_icon-size: var(--icon-size, 1rem);
+  font-size: var(--_icon-size);
   white-space: nowrap;
 
   .site-icon-text {
@@ -10,12 +11,12 @@
     vertical-align: middle;
     &::before {
       content: "";
-      width: $icon_size;
-      height: $icon_size;
+      width: var(--_icon-size);
+      height: var(--_icon-size);
       display: inline-block;
       background: url("/icons.png");
-      background-size: $icon_size;
-      background-position: 0px calc(var(--icon-index) * #{$icon_size} * -1);
+      background-size: var(--_icon-size);;
+      background-position: 0px calc(var(--icon-index) * var(--_icon-size) * -1);
     }
   }
 }
diff --git a/app/stylesheet/specific/artists.scss b/app/stylesheet/specific/artists.scss
@@ -4,5 +4,5 @@
 }
 
 .artist-link {
-  @include site_icon(1.5rem)
+  --icon-size: 1.5rem;
 }
diff --git a/app/stylesheet/specific/submission_files.scss b/app/stylesheet/specific/submission_files.scss
@@ -34,10 +34,6 @@
       background:  $color-table-section;
     }
   }
-
-  .submission-file-stats {
-    @include site_icon(1rem)
-  }
 }
 
 .original { 

diff --git a/app/views/artists/_artist_link.html.erb b/app/views/artists/_artist_link.html.erb
@@ -1,19 +1,20 @@
 <%# locals: (artist_url:) -%>
 <div class="artist-link">
-  <%= site_icon artist_url %>
-  <%= link_to artist_url.unescaped_url_identifier, artist_path(artist_url.artist, search: { artist_url_id: [artist_url.id] }), class: "site-icon-text" %>
-  <%= link_to "[U]", enqueue_artist_url_path(artist_url), method: :post, title: "Last scraped: #{last_scraped_at_text(artist_url)}" if artist_url.scraper_enabled? %>
-  <% if artist_url.id.in? job_stats.scraping_now %>
-    [Scraping now!] <%= scraper_status(artist_url, prefix: "Status") %>
-  <% end %>
-  <% if job_stats.scraping_queued[artist_url.id] %>
-    [Scraping queued] <%= scraper_status(artist_url, prefix: "Status") %>
-  <% end %>
-  <% if job_stats.submission_download_queued[artist_url.id] %>
-    [<%= job_stats.submission_download_queued[artist_url.id] %> pending
-      <%= artist_url.site_type == "tumblr" ? "reblogs" : "file downloads" %>]
-  <% end %>
-  <% if job_stats.e6_iqdb_queued[artist_url.id] %>
-    [<%= job_stats.e6_iqdb_queued[artist_url.id] %> pending e6 iqdb calls]
+  <%= site_icon artist_url do %>
+    <%= link_to artist_url.unescaped_url_identifier, artist_path(artist_url.artist, search: { artist_url_id: [artist_url.id] }) %>
+    <%= link_to "[U]", enqueue_artist_url_path(artist_url), method: :post, title: "Last scraped: #{last_scraped_at_text(artist_url)}" if artist_url.scraper_enabled? %>
+    <% if artist_url.id.in? job_stats.scraping_now %>
+      [Scraping now!] <%= scraper_status(artist_url, prefix: "Status") %>
+    <% end %>
+    <% if job_stats.scraping_queued[artist_url.id] %>
+      [Scraping queued] <%= scraper_status(artist_url, prefix: "Status") %>
+    <% end %>
+    <% if job_stats.submission_download_queued[artist_url.id] %>
+      [<%= job_stats.submission_download_queued[artist_url.id] %> pending
+        <%= artist_url.site_type == "tumblr" ? "reblogs" : "file downloads" %>]
+    <% end %>
+    <% if job_stats.e6_iqdb_queued[artist_url.id] %>
+      [<%= job_stats.e6_iqdb_queued[artist_url.id] %> pending e6 iqdb calls]
+    <% end %>
   <% end %>
 </div>