Merge branch 'feat/use-new-api-icon' into 'master'

Feat/use new api icon

Closes #118440

See merge request gitlab-org/gitlab!34700

app/models/blob_viewer/image.rb

@@ -8,7 +8,7 @@ module BlobViewer
     self.partial_name = 'image'
     self.extensions = UploaderHelper::SAFE_IMAGE_EXT
     self.binary = true
-    self.switcher_icon = 'picture-o'
+    self.switcher_icon = 'doc-image'
     self.switcher_title = 'image'
   end
 end

app/models/blob_viewer/notebook.rb

@@ -8,7 +8,7 @@ module BlobViewer
     self.partial_name = 'notebook'
     self.extensions = %w(ipynb)
     self.binary = false
-    self.switcher_icon = 'file-text-o'
+    self.switcher_icon = 'doc-text'
     self.switcher_title = 'notebook'
   end
 end

app/models/blob_viewer/open_api.rb

@@ -8,8 +8,6 @@ module BlobViewer
     self.partial_name = 'openapi'
     self.file_types = %i(openapi)
     self.binary = false
-    # TODO: get an icon for OpenAPI
-    self.switcher_icon = 'file-pdf-o'
-    self.switcher_title = 'OpenAPI'
+    self.switcher_icon = 'api'
   end
 end

app/models/blob_viewer/rich.rb

@@ -6,7 +6,7 @@ module BlobViewer
 
     included do
       self.type = :rich
-      self.switcher_icon = 'file-text-o'
+      self.switcher_icon = 'doc-text'
       self.switcher_title = 'rendered file'
     end
   end

app/models/blob_viewer/svg.rb

@@ -8,7 +8,7 @@ module BlobViewer
     self.partial_name = 'svg'
     self.extensions = %w(svg)
     self.binary = false
-    self.switcher_icon = 'picture-o'
+    self.switcher_icon = 'doc-image'
     self.switcher_title = 'image'
   end
 end

app/models/diff_viewer/image.rb

@@ -8,7 +8,7 @@ module DiffViewer
     self.partial_name = 'image'
     self.extensions = UploaderHelper::SAFE_IMAGE_EXT
     self.binary = true
-    self.switcher_icon = 'picture-o'
+    self.switcher_icon = 'doc-image'
     self.switcher_title = _('image diff')
   end
 end

app/views/projects/blob/_viewer_switcher.html.haml

@@ -5,8 +5,8 @@
   .btn-group.js-blob-viewer-switcher.ml-2{ role: "group" }>
     - simple_label = "Display #{simple_viewer.switcher_title}"
     %button.btn.btn-default.btn-sm.js-blob-viewer-switch-btn.has-tooltip{ 'aria-label' => simple_label, title: simple_label, data: { viewer: 'simple', container: 'body' } }>
-      = icon(simple_viewer.switcher_icon)
+      = sprite_icon(simple_viewer.switcher_icon)
 
     - rich_label = "Display #{rich_viewer.switcher_title}"
     %button.btn.btn-default.btn-sm.js-blob-viewer-switch-btn.has-tooltip{ 'aria-label' => rich_label, title: rich_label, data: { viewer: 'rich', container: 'body' } }>
-      = icon(rich_viewer.switcher_icon)
+      = sprite_icon(rich_viewer.switcher_icon)

changelogs/unreleased/feat-use-new-api-icon.yml

+---
+title: Use new icon for api preview
+merge_request: 34700
+author: Roger Meier
+type: added