Bug 1472966 - Do not show "Rendered fonts" accordion if there are no fonts to show. r=gl draft
authorRazvan Caliman <rcaliman@mozilla.com>
Tue, 03 Jul 2018 20:14:09 +0200
changeset 814079 71b436c398ffb7de1213830d4449deadfe33c021
parent 814078 efbaa1dab4229e3d7caa83f6415d6a4d589f9cb2
child 814080 2bcca12bf6bc12be5263d02365f9c9c416aa613d
child 814125 af8d6a8cc01dec782bd4ffbcb2f9d3cc203b4640
child 814126 aefb87ba89cdd65c2c4f0461d9078b34dd5f74bb
push id115083
push userbmo:rcaliman@mozilla.com
push dateWed, 04 Jul 2018 12:05:55 +0000
reviewersgl
bugs1472966
milestone63.0a1
Bug 1472966 - Do not show "Rendered fonts" accordion if there are no fonts to show. r=gl MozReview-Commit-ID: CF1eAnPvLnO
devtools/client/inspector/fonts/components/FontOverview.js
devtools/client/themes/fonts.css
--- a/devtools/client/inspector/fonts/components/FontOverview.js
+++ b/devtools/client/inspector/fonts/components/FontOverview.js
@@ -41,31 +41,33 @@ class FontOverview extends PureComponent
       onPreviewFonts,
       onToggleFontHighlight,
     } = this.props;
     const { fonts } = fontData;
 
     // If the font editor is enabled, show the fonts in a collapsed accordion.
     // The editor already displays fonts, in another way, rendering twice is not desired.
     if (Services.prefs.getBoolPref(PREF_FONT_EDITOR)) {
-      return Accordion({
+      return fonts.length ? Accordion({
         items: [
           {
             header: getStr("fontinspector.renderedFontsInPageHeader"),
             component: FontList,
             componentProps: {
               fonts,
               fontOptions,
               onPreviewFonts,
               onToggleFontHighlight,
             },
             opened: false
           }
         ]
-      });
+      })
+      :
+      null;
     }
 
     return fonts.length ?
       FontList({
         fonts,
         fontOptions,
         onPreviewFonts,
         onToggleFontHighlight,
--- a/devtools/client/themes/fonts.css
+++ b/devtools/client/themes/fonts.css
@@ -339,11 +339,15 @@
   background: url(chrome://devtools/skin/images/copy.svg) no-repeat;
   background-size: 12px;
   background-position-x: -1px;
   -moz-context-properties: fill;
   fill: var(--theme-toolbar-color);
 
 }
 
-#font-container .devtools-sidepanel-no-result + .accordion {
-  border-block-start: 1px solid var(--theme-splitter-color);
+#font-container .accordion {
+  border-top: 1px solid var(--theme-splitter-color);
 }
+
+#font-container .accordion + .accordion {
+  border-top: none;
+}