Commit 129210b5 authored by Anton V. Boyarshinov's avatar Anton V. Boyarshinov

Merge branch 'alt-desktop' into school-master

Conflicts: Makefile.in
parents 2cd340b7 e77105d7
......@@ -17,7 +17,8 @@ all:
convert background.png kde3-styles-splash/Background.jpg
cp -al background.png kde3-styles-splash/Background.png
convert -resize '400x320!' images/background.png kde3-styles-splash/Preview.png
convert images/background.png -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' alterator/design/bg.png
# installer background
convert images/installer.png -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' alterator/design/bg.png
# console background
cp -al images/console.jpg bootsplash/images/bootsplash-800x600.jpg
convert -resize '640x480!' bootsplash/images/bootsplash-800x600.jpg bootsplash/images/bootsplash-640x480.jpg
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment