Commit Graph

34 Commits

Author SHA1 Message Date
Andrey Cherepanov
a5c998b85a Replace Simply Linux logo by Platform Seven logo 2013-12-05 19:01:15 +04:00
Andrey Cherepanov
000989f5d0 Merge branch 'school-server' into school-master
Conflicts:
	Makefile.in
	branding.spec
	components/ahttpd/images/groups/datetime.png
	components/ahttpd/images/groups/firewall.png
	components/ahttpd/images/groups/mail.png
	components/ahttpd/images/groups/network.png
	components/ahttpd/images/groups/pkg.png
	components/ahttpd/images/groups/servers.png
	components/ahttpd/images/groups/system.png
	components/ahttpd/images/groups/users.png
	components/ahttpd/images/groups/xorg.png
	components/ahttpd/images/steps/install2-preinstall.png
	components/ahttpd/images/steps/timezone.png
	components/ahttpd/styles/alterator.css.in
	components/bootloader/config.in
	components/bootloader/gfxboot.cfg.in
	components/browser-qt/design/design.qss.in
	components/indexhtml/index-en.html.in
	components/indexhtml/index-ru.html.in
	components/indexhtml/index.css
	components/systemd/os-release.in
	configure.ac
	gnome-settings/index.theme.in
	gnome-settings/metacity-theme-1.xml.in
	images/background16x9.png
	images/background4x3.png
	images/boot.png
	images/grub.png
	images/product-logo.png
	notes/index-ru.html.in
	slideshow/README
2013-10-16 20:47:53 +04:00
Andrey Cherepanov
0c91ca4a48 Merge branch 'school-teacher' into school-server
Conflicts:
	Makefile.in
	branding.spec
	components.mk
	components/ahttpd/images/first-page-button.svg
	components/ahttpd/images/groups/firewall.png
	components/ahttpd/images/groups/network.png
	components/ahttpd/images/groups/pkg.png
	components/ahttpd/images/groups/system.png
	components/ahttpd/images/groups/users.png
	components/ahttpd/images/groups/xorg.png
	components/ahttpd/images/last-page-button.svg
	components/ahttpd/images/next-page-button.svg
	components/ahttpd/images/prev-page-button.svg
	components/ahttpd/images/steps/datetime.png
	components/ahttpd/images/steps/finish.png
	components/ahttpd/images/steps/greeting.png
	components/ahttpd/images/steps/install.png
	components/ahttpd/images/steps/install2-basesystem.png
	components/ahttpd/images/steps/lilo.png
	components/ahttpd/images/steps/net-eth.png
	components/ahttpd/images/steps/notes-license.png
	components/ahttpd/images/steps/notes-release-notes.png
	components/ahttpd/images/steps/pkg-groups.png
	components/ahttpd/images/steps/preinstall.png
	components/ahttpd/images/steps/root.png
	components/ahttpd/images/steps/sysconfig-base.png
	components/ahttpd/images/steps/sysconfig-kbd.png
	components/ahttpd/images/steps/sysconfig-language.png
	components/ahttpd/images/steps/user.png
	components/ahttpd/images/steps/users.png
	components/ahttpd/images/steps/vm.png
	components/ahttpd/images/steps/x11.png
	components/bootloader/config.in
	components/bootloader/gfxboot.cfg.in
	components/browser-qt/design/design.ini.in
	components/browser-qt/design/design.qss.in
	components/browser-qt/theme.qrc
	components/grub2/theme.txt
	components/indexhtml/images/altlinux-logo.png
	components/indexhtml/images/bullet.png
	components/indexhtml/images/community.png
	components/indexhtml/images/documentation.png
	components/indexhtml/images/facebook.png
	components/indexhtml/images/lines.png
	components/indexhtml/images/twitter.png
	components/indexhtml/images/vkontakte.png
	components/indexhtml/index-en.html.in
	components/indexhtml/index-ru.html.in
	components/indexhtml/index.css
	components/indexhtml/indexhtml.desktop.in
	components/systemd/os-release.in
	configure.ac
	graphics/kde/kdm-logo.png
	images/product-logo.png
	notes/Makefile
	notes/license.all.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	xfce-settings/etcskel/.config/xfce4/desktop/icons.screen0.rc
	xfce-settings/etcskel/.config/xfce4/helpers.rc
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
2013-10-14 18:43:20 +04:00
Andrey Cherepanov
afafe26426 6.9.9-alt1
- Update branding for Seven platform
2013-09-09 23:33:38 +04:00
Anton V. Boyarshinov
c936bf7563 6.9.9-alt3
- wallpaper from Ark Desktop added
2013-04-30 23:17:51 +04:00
c7becfb841 - update backgrounds 2012-07-04 17:13:40 +04:00
b7a9486e62 - update color scheme 2012-07-04 17:12:21 +04:00
Mikhail Efremov
bfe8bfb314 New slinux logo. 2011-07-20 20:19:57 +04:00
Mikhail Efremov
b728c6cce0 Drop slinux-thunar icon.
It is not used anymore.
2011-07-15 18:45:44 +04:00
Alexandra Panyukova
c533f983ec adding more sizes for thunar icon 2011-06-30 17:32:07 +04:00
Alexandra Panyukova
f9620d62bd adding new icon 2011-06-28 20:21:38 +04:00
ba9ddd4de1 - update kdm colors 2011-06-03 13:51:49 +04:00
e2e3507399 - update kdm color theme 2011-05-31 19:14:26 +04:00
a3c20f06eb - update kdm color scheme 2011-05-31 18:10:52 +04:00
84e64e5c33 - update background color 2011-05-30 18:25:13 +04:00
Anton V. Boyarshinov
10730901a2 move all from subdirectory to be more compatibnle with other brandings 2011-05-13 08:42:14 +04:00
e957347b16 - fix default background color 2011-04-28 17:21:07 +04:00
28bc99273d - remove old backgrounds 2011-04-28 11:45:31 +04:00
cb75c19654 - return kde3 startup splash 2011-03-24 17:17:11 +03:00
dca537650c - update kdm4 color scheme 2011-02-07 18:41:23 +03:00
f0166fbb91 - update default background color 2010-09-13 19:42:16 +04:00
9bba8fa035 - update default ksplash theme from Air 2010-09-13 19:39:05 +04:00
817c3e7c7f - update default kdm theme from oxygen-air 2010-09-13 19:34:42 +04:00
1c042033bb - update kdm4 color scheme 2010-09-13 19:26:27 +04:00
2041f118c1 - fix path 2010-09-09 18:37:51 +04:00
4ed8bd5039 - update design-graphics 2009-11-19 17:26:37 +03:00
Anton V. Boyarshinov
cb2b786ecd Merge branch 'master' into alt-desktop 2009-06-25 18:45:55 +04:00
Anton V. Boyarshinov
9a5161ee85 deleted: graphics/backgrounds/wallpaper.png: double wallpaper removed 2009-06-25 18:45:06 +04:00
Anton V. Boyarshinov
6487641019 Background from 4.1 Desktop 2009-06-25 18:43:17 +04:00
Alexandra Panyukova
e8aca6415f wallpaper for kde4 fixed 2009-04-03 16:37:06 +04:00
Alexandra Panyukova
f07bc1d52e new images 2009-04-02 19:39:21 +04:00
Anton V. Boyarshinov
9ac7d0cfdb 5.0-alt6
- xdm background fixed
2009-01-26 18:44:09 +03:00
Anton V. Boyarshinov
e5acd16ec7 design consolidating 2008-12-24 17:25:42 +03:00
Anton V. Boyarshinov
69433815d9 some initial files 2008-12-18 15:11:02 +03:00