[gnome-shell] popupMenu: Use .selected class for active item

[Florian Müllner <fmuellner src gnome org>]

commit 8b6e56672851d10be857c8f548bedc5a83d975d6
Author: Florian Müllner <fmuellner gnome org>
Date:   Mon Mar 16 16:52:53 2015 +0100

    popupMenu: Use .selected class for active item
    
    Currently it uses .active, which matches the code more closely, but
    is confusingly close to :active; so .selected it is ...
    
    https://bugzilla.gnome.org/show_bug.cgi?id=745246

 data/theme/gnome-shell-high-contrast.css |    2 +-
 data/theme/gnome-shell-sass              |    2 +-
 data/theme/gnome-shell.css               |    2 +-
 js/ui/popupMenu.js                       |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index aad3777..c2160c2 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -401,7 +401,7 @@ StScrollBar {
       color: #ffffff; }
     .popup-menu .popup-menu-item:insensitive {
       color: rgba(255, 255, 255, 0.5); }
-  .popup-menu .active {
+  .popup-menu .selected {
     background-color: #215d9c; }
   .popup-menu .popup-inactive-menu-item {
     color: #fff; }
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index e7f8bec..bc0a7a9 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit e7f8bec7ef161e42ad3678aca0b99e13298af7ff
+Subproject commit bc0a7a9fcdc32bf79679542dba41a4a6de5615f1
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 0267213..2708894 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -401,7 +401,7 @@ StScrollBar {
       color: #ffffff; }
     .popup-menu .popup-menu-item:insensitive {
       color: rgba(238, 238, 236, 0.5); }
-  .popup-menu .active {
+  .popup-menu .selected {
     background-color: #215d9c; }
   .popup-menu .popup-inactive-menu-item {
     color: #eeeeec; }
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 72a62bd..404e681 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -169,10 +169,10 @@ const PopupBaseMenuItem = new Lang.Class({
         if (activeChanged) {
             this.active = active;
             if (active) {
-                this.actor.add_style_class_name('active');
+                this.actor.add_style_class_name('selected');
                 this.actor.grab_key_focus();
             } else {
-                this.actor.remove_style_class_name('active');
+                this.actor.remove_style_class_name('selected');
                 // Remove the CSS active state if the user press the button and
                 // while holding moves to another menu item, so we don't paint all items.
                 // The correct behaviour would be to set the new item with the CSS