Merge remote-tracking branch 'boyarsh/centaurus' into kdesktop

branding.spec

@@ -393,6 +393,10 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Thu Feb 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt3
+- fixed logo in web interface
+- boot colors changed
+
 * Mon Feb 07 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt6
 - update kdm4 color scheme
 - import last changes from centaurus branding

components.mk

@@ -18,7 +18,7 @@ ahttpd:
 	done
 	install -d $(datadir)/alterator/design/styles
 	cp -a components/ahttpd/images $(datadir)/alterator/design
-	install -Dpm644 images/product-logo.png $(datadir)/alterator/design/images/product-logo.png
+#	install -Dpm644 images/product-logo.png $(datadir)/alterator/design/images/product-logo.png
 	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
 
 

configure.ac

@@ -5,7 +5,7 @@ PROGRESS_COLOR=`./fetch_color selectBackground` #MIDDLE_COLOR_DEC
 TITLE_COLOR=`./fetch_color handle`
 INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
 LIGHT_COLOR_HEX=F5F5F5 #new
-MIDDLE_COLOR_HEX=c1c3cb #new
+MIDDLE_COLOR_HEX=306ac4 #new
 DARK_COLOR_HEX=001056
 LIGHT_LABELS_HEX=FFFFFF #new
 DARK_LABELS_HEX=242a60  #mew