[gnome-shell/eos3.8: 149/255] fixup! discoveryFeed: Add Discovery Feed Button

[Matthew Leeds <mwleeds src gnome org>]

commit e2ce1e164a75716494bedfd5deccfd870470c1d1
Author: Andre Moreira Magalhaes <andre endlessm com>
Date:   Fri Mar 27 20:35:35 2020 -0300

    fixup! discoveryFeed: Add Discovery Feed Button
    
    Commit c89d6a633 introduced a fallback icon for St.Icon and that broke
    the discovery feed which was drawing the "image-missing" icon on top of
    the bar and button.
    
    Lets fix that by not using a St.Icon as child for the discovery feed bar
    and button.
    
    https://phabricator.endlessm.com/T28780

 data/theme/gnome-shell-sass/_endless.scss |  4 ++--
 js/ui/discoveryFeedButton.js              | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_endless.scss b/data/theme/gnome-shell-sass/_endless.scss
index 8b39c7e404..29f9f0256d 100644
--- a/data/theme/gnome-shell-sass/_endless.scss
+++ b/data/theme/gnome-shell-sass/_endless.scss
@@ -368,7 +368,7 @@ popup-separator-menu-item {
 
 // Discovery Feed
 
-.discovery-feed-bar-icon {
+.discovery-feed-bar {
     background-image: url("resource:///org/gnome/shell/theme/discovery-feed-bar-normal.png");
     height: 18px;
     width: 1004px;
@@ -378,7 +378,7 @@ popup-separator-menu-item {
     }
 }
 
-.discovery-feed-tile-icon {
+.discovery-feed-tile {
     background-image: url("resource:///org/gnome/shell/theme/discovery-feed-tile-normal.png");
     height: 27px;
     width: 62px;
diff --git a/js/ui/discoveryFeedButton.js b/js/ui/discoveryFeedButton.js
index 29a6f2f360..e3250ef49e 100644
--- a/js/ui/discoveryFeedButton.js
+++ b/js/ui/discoveryFeedButton.js
@@ -52,14 +52,12 @@ class DiscoveryFeedButton extends St.BoxLayout {
 
         this._bar = new St.Button({
             name: 'discovery-feed-bar',
-            child: new St.Icon({ style_class: 'discovery-feed-bar-icon' }),
             style_class: 'discovery-feed-bar',
         });
         this.add_child(this._bar);
 
         this._tile = new St.Button({
             name: 'discovery-feed-tile',
-            child: new St.Icon({ style_class: 'discovery-feed-tile-icon' }),
             style_class: 'discovery-feed-tile',
             x_expand: true,
             x_align: Clutter.ActorAlign.CENTER,
@@ -83,11 +81,11 @@ class DiscoveryFeedButton extends St.BoxLayout {
 
     _onHoverChanged(actor) {
         if (actor.get_hover()) {
-            this._bar.child.add_style_pseudo_class('highlighted');
-            this._tile.child.add_style_pseudo_class('highlighted');
+            this._bar.add_style_pseudo_class('highlighted');
+            this._tile.add_style_pseudo_class('highlighted');
         } else {
-            this._bar.child.remove_style_pseudo_class('highlighted');
-            this._tile.child.remove_style_pseudo_class('highlighted');
+            this._bar.remove_style_pseudo_class('highlighted');
+            this._tile.remove_style_pseudo_class('highlighted');
         }
     }