Merge branch 'dojo-1.12.1'

Conflicts:
	js/prefs.js

1 files changed, 3 insertions, 5 deletions

diff --git a/themes/night.css b/themes/night.css
index 23c2a6de1..7f381b9c1 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -159,15 +159,13 @@ body#ttrssMain #floatingTitle a.title {
 
 body#ttrssMain .dijitMenu,
 body#ttrssMain .dijitMenuTable,
-body#ttrssMain .dijitSelectMenu .dijitMenuItem td {
+body#ttrssMain .dijitMenu .dijitMenuItem td {
 	border-color : #666;
 	background : #666;
 }
 
-body#ttrssMain .dijitMenu .dijitMenuItem.dijitHover,
-body#ttrssMain .dijitMenu .dijitMenuItem.dijitFocused,
-body#ttrssMain .dijitMenuTable .dijitMenuItem.dijitHover .dijitMenuItemLabel,
-body#ttrssMain .dijitMenuTable .dijitMenuItem.dijitFocused .dijitMenuItemLabel {
+body#ttrssMain .dijitMenu .dijitMenuItemSelected,
+body#ttrssMain .dijitMenu .dijitMenuItemSelected td {
 	background : black;
 	color : white;
 }