Merge remote branch 'boyarsh/centaurus' into kdesktop

branding.spec

@@ -373,6 +373,8 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_desktopdir/indexhtml.desktop
 
 %changelog
+#- gfxboot colors changed
+
 * Tue Nov 16 2010 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt3
 - import last changes from centaurus:
   - plymouth: scaling for non 4:3 or 16:9 resolutions fixed

components/bootloader/gfxboot.cfg.in

@@ -43,15 +43,15 @@ mainmenu.bar.color=0x001056
 mainmenu.normal.fg=0x001056
 mainmenu.selected.fg=0xffffff
 ; boot option colors
-bootopt.label.fg=0x@DARK_LABELS_HEX@
-bootopt.text.fg=0x@DARK_LABELS_HEX@
+bootopt.label.fg=0xffffff
+bootopt.text.fg=0xffffff
 ; progress bar color
 progress.bar.color=0x@MIDDLE_COLOR_HEX@
 ; menu colors
 menu.normal.bg=0x798491
-menu.normal.fg=0x@DARK_LABELS_HEX@
+menu.normal.fg=@DARK_LABELS_HEX@
 menu.selected.bg=0x@LIGHT_COLOR_HEX@
-menu.selected.fg=0x@DARK_LABELS_HEX@
+menu.selected.fg=@DARK_LABELS_HEX@
 ; window colors
 window.bg=0xd8deed
 window.fg=0x000000
@@ -65,9 +65,9 @@ help.link.selected.bg=0x@DARK_COLOR_HEX@
 help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
-panel.title.fg=0x5c6570
-panel.normal.fg=0x5c6570
-panel.f-key.fg=0x@DARK_LABELS_HEX@
+panel.title.fg=0xffffff
+panel.normal.fg=0xffffff
+panel.f-key.fg=0xffffff
 ; default keymap (e.g. de_DE, czech)
 keymap=