Fix some things in branding

Makefile.in

@@ -12,11 +12,13 @@ all:
 	cp -al images/wallpaper.png graphics/backgrounds/default.png
 	cp -al images/wallpaper.png graphics/backgrounds/xdm.png
 # make wallpapers for gfxboot and grub2
-	convert images/background4x3.png -resize 800x600 images/small.png
+#	convert images/background4x3.png -resize 800x600 images/small.png
 
 # display status
-	convert images/small.png images/product-logo.png -geometry +30+30 -composite images/grub.png
-	#cp -al images/grub.png images/boot.png
+#	convert images/small.png images/product-logo.png -geometry +30+30 -composite images/grub.png
+#	cp -al images/grub.png images/boot.png
+# use predefined image 800x600 with logo
+	cp -al images/boot.png images/grub.png
 # product logo for ahttpd
 	cp -al images/product-logo.png components/ahttpd/images/product-logo.png
 # product logo for indexhtml

branding.spec

@@ -16,7 +16,7 @@
 
 Name: branding-%brand-%theme
 Version: 8.0
-Release: alt0.2.M80P.1
+Release: alt0.3.M80P.1
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-google-droid-sans
@@ -511,6 +511,11 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
 #config %_localstatedir/ldm/.pam_environment
 
 %changelog
+* Tue Aug 30 2016 Andrey Cherepanov <cas@altlinux.org> 8.0-alt0.3.M80P.1
+- Set yellow labels for gfxboot
+- Use predefined boot.png with logo for grub
+- Set bright color for menubar in grub
+
 * Fri Aug 26 2016 Andrey Cherepanov <cas@altlinux.org> 8.0-alt0.2.M80P.1
 - Do not require polkit-gnome
 - Set SimpleSL icon theme in XFCE settings

components.mk

@@ -56,10 +56,10 @@ boot: boot-images
 	#install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)
 	install -m644 components/bootloader/bootlogo $(datadir)/gfxboot/$(THEME)
 #grub2
-	convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#0c2c6c' components/grub2/selected_blob_c.png
+	convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#268BD2' components/grub2/selected_blob_c.png
 	install -d -m 755  $(sysconfdir)/../boot/grub/themes/$(THEME)
 	cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
-	install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
+	install -m 644 images/boot.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
 	install -m 644 images/boot.jpg $(sysconfdir)/../boot/grub/themes/$(THEME)/grub.jpg
 
 # index html page, start page for all local browsers

components/bootloader/gfxboot.cfg.in

@@ -44,7 +44,7 @@ mainmenu.normal.fg=0xb6c1cd
 mainmenu.selected.fg=0xffffff
 ; boot option colors
 bootopt.label.fg=0xffffff
-bootopt.text.fg=0xffffff
+bootopt.text.fg=0xf8e97c
 ; progress bar color
 progress.bar.color=0x@MIDDLE_COLOR_HEX@
 ; menu colors
@@ -66,7 +66,7 @@ help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
 panel.title.fg=0xffffff
-panel.normal.fg=0xf1f1ff
+panel.normal.fg=0xf8e97c
 panel.f-key.fg=0xf8e97c
 ; default keymap (e.g. de_DE, czech)
 keymap=