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

branding.spec

@@ -393,6 +393,9 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Mon Feb 21 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt4
+- indexhtml colors changed (mex3)
+
 * Fri Feb 11 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt7
 - 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
 
 

components/indexhtml/index.css.in

 /* Stylesheet for index file */
 
 body {
-	background-color: #@MIDDLE_COLOR_HEX@;
+	background-color: #c1c3cb;
 	color: #@MIDDLE_LABELS_HEX@;
 	margin: 0px;
 	padding: 10px;
@@ -38,13 +38,13 @@ div.box {
     width: 780px;
     margin-top: 10px;
 
-    background: #FFFFFF;
+    background: #@LIGHT_LABELS_HEX@;
     padding: 0.2em;
     padding-right: 2mm;
     padding-top: 2mm;
     padding-bottom: 2mm;
 
-    border: 1px solid #@MIDDLE_COLOR_HEX@;
+    border: 1px solid #c1c3cb;
 }
 
 #lang {