Merge branch 'default' into default-server

Makefile.in

@@ -3,16 +3,17 @@ all:
 	cp -a bootloader/config design-bootloader-source/
 	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-install/
 	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/
-	convert images/boot.jpg -gravity northeast -pointsize 20  -annotate 0 '@STATUS@' boot.jpg
-	convert images/boot.jpg -resize 800x600 -gravity northeast -pointsize 20  -annotate 0 '@STATUS@' boot-800x600.jpg
+	convert images/boot.jpg -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@"' boot.jpg
+	convert images/boot.jpg -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@"' boot-800x600.jpg
 	cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
 	cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg
 	cp -al boot.jpg bootsplash/images/silent-1024x768.jpg
 	convert -resize '800x600!' bootsplash/images/silent-1024x768.jpg bootsplash/images/silent-800x600.jpg
 	convert -resize '640x480!' bootsplash/images/silent-800x600.jpg bootsplash/images/silent-640x480.jpg
 # background
-	convert images/background.png -gravity northeast -pointsize 30  -annotate 0 '@STATUS@' background.png
-	cp -al background.png graphics/backgrounds/default.png
+	convert images/background.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' background.png
+	convert graphics/backgrounds/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' prototype.png
+	cp -al prototype.png graphics/backgrounds/default.png
 	cp -al background.png graphics/backgrounds/xdm.png
 	convert -resize '800x600!' background.png alterator/design/bg.png
 # console background

alterator/design/design.ini.in

-Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@PROGRESS_COLOR@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
-Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@PROGRESS_COLOR@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
+Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@MIDDLE_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
+Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@MIDDLE_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
  Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4,  #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7,  #eeece9, #000000, #aed4a1, #141312
 

alterator/design/design.qss → alterator/design/design.qss.in

@@ -22,7 +22,7 @@ QLineEdit[echoMode="2"] {
 
 /* Customize tooltips. */
 QToolTip {
-    background-color: rgb(200,200,255);
+    background-color: rgb(@MIDDLE_COLOR_DEC@);
     border-color: darkslategray;
     border-width: 1px;
     border-style: solid;

alterator/styles/alterator.css.in

+body {
+	background-color: #@MIDDLE_COLOR_HEX@;/*#92b2b8;/*#67999a;/*#c0dbdb;*/
+	color: #@DARK_COLOR_HEX@;
+	margin: 0px;
+	padding: 10px;
+	font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 9pt;
+}
+
+a {
+	color: #@DARK_COLOR_HEX@;
+	font-weight: bold;
+}
+
+table {
+	font-size: 9pt;
+	border-color: #@DARK_COLOR_HEX@;
+	border-collapse: collapse;
+}
+
+th {
+	padding: 0px 7px 3px 0px;
+}
+
+tr {
+	vertical-align: top;
+}
+
+hr {
+	border: none;
+	border-top: 1px solid #5ac;
+}
+
+h1 {
+	text-align: center;
+	margin: 0px;
+}
+
+textarea, select, input.text {
+	border: 1px solid #@DARK_COLOR_HEX@;
+	font-size: 8pt;
+	margin: 1px 3px 1px 0px;
+	padding: 1px 3px;
+}
+
+.btn {
+	background-color: #@MIDDLE_COLOR_HEX@;
+	color: #@DARK_COLOR_HEX@;
+	border: 1px solid #@DARK_COLOR_HEX@;
+	cursor: pointer;
+	font-size: 9pt;
+	padding: 0px 3px;
+}
+
+.btn:hover {
+	background-color: #@MIDDLE_COLOR_HEX@;
+}
+
+.error-message {
+	background-color: #FFCACA;
+	border: 1px solid #FF6060;
+	padding-left:10px;
+	padding-right:10px;
+	margin-bottom:10px;
+}
+
+.info-name {
+	font-size: 18pt;
+	border-bottom: 2px solid #@DARK_COLOR_HEX@;
+}
+
+.info-description {
+	font-size: 12pt;
+	font-weight: bold;
+	padding-top: 10px;
+}
+
+
+.frame-table {
+	border-style:solid;
+	border-width:1px;
+	margin: 3px;
+}
+
+.frame-table td, .frame-table th {
+	border-style:solid;
+	border-width:1px;
+	padding: 1px 1px 3px 3px;
+}
+
+.disabled {
+	color: #@DARK_COLOR_HEX@;
+}
+
+.alterator-progress {
+	border: 1px solid #@DARK_COLOR_HEX@;
+	height: 20px;
+	width: 200px;
+	padding: 2px;
+	background-color: #@LIGHT_LABELS_HEX@;
+}
+
+.alterator-progress div {
+	background-color: #@DARK_COLOR_HEX@;
+	height: 20px;
+}
+
+.year {
+	font-weight: bold;
+	background-color: #@LIGHT_COLOR_HEX@;
+}
+
+.week {
+	border-style:solid;
+	border-width:1px;
+	background-color: white;
+}
+
+.today {
+	border-style:solid;
+	border-width:1px;
+	background-color: pink;
+	cursor: pointer;
+}
+
+.day {
+	border-style:solid;
+	border-width:1px;
+	background-color: #@LIGHT_COLOR_HEX@;
+	cursor: pointer;
+}
+
+.day:hover {
+	background-color: #@DARK_COLOR_HEX@;
+}
+
+.alterator-dateedit-calendar table {
+	width: 100%;
+	text-align: center;
+	background-color: #@LIGHT_COLOR_HEX@;
+	border-style: solid;
+	border-width: 1px;
+}
+
+.alterator-dateedit-calendar td {
+	padding: 3px;
+}
+
+.alterator-dateedit-button {
+	vertical-align:middle;
+	cursor:pointer;
+	background: url(/design/images/dateedit.png) no-repeat;
+	width: 15px;
+	height: 16px;
+}
+
+table.alterator-listbox {
+	border: solid 1px;
+}
+
+table.alterator-listbox th {
+	background-color:  #cdcdcd;
+	font-weight: bold;
+	border: solid 1px;
+	padding: 3px;
+}
+
+table.alterator-listbox td {
+	background: #@LIGHT_COLOR_HEX@;
+	border-left: solid 1px;
+	border-right: solid 1px;
+	padding: 3px;
+}

alterator/styles/menu.css.in

+/* c0dbdb */
+
+#logo-td {
+	border-left: none;
+	padding-left: 10px;
+	padding-right: 10px;
+	text-align:left;
+/*	background: #fff;*/
+	padding-top: 10px;
+	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+	width: 275px;
+	-moz-border-radius-topleft: 1em;
+	-webkit-border-radius-topleft: 1em;
+	-khtml-border-radius-topleft: 1em;
+	border-radius-topleft: 1em;
+	-moz-border-radius-bottomleft: 1em;
+	-webkit-border-radius-bottomleft: 1em;
+	-khtml-border-radius-bottomleft: 1em;
+	border-radius-bottomleft: 1em;
+}
+
+#logo-td img {
+	background: url(/design/images/logo.png) no-repeat;
+	width: 275px; /*325*/
+	height: 30px;
+}
+
+#help-td {
+	/*border-left: none;*/
+	padding-left: 10px;
+	padding-right: 10px;
+	padding-top: 10px;
+	width: 20px;
+	text-align:left;
+	color: #@LIGHT_LABELS_HEX@;
+/*        border-bottom: 1px solid #056560;;*/
+	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+/*	-moz-border-radius-topleft: 1em;
+	-moz-border-radius-topright: 1em;
+        -webkit-border-radius-topleft: 1em;
+        -khtml-border-radius-topleft: 1em;
+        border-radius-topleft: 1em; */
+}
+
+#locale-td {
+/*	border-left: none; */
+	padding-left: 10px;
+	padding-top: 10px;
+	color: #@LIGHT_LABELS_TEXT@;
+	padding-right: 10px;
+	text-align:center;
+	width: 100px;
+	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+/*	border-left: 1px solid #056560;;
+	border-right: 1px solid #@DARK_COLOR_HEX@;;
+	border-bottom: 1px solid #@DARK_COLOR_HEX@;; */
+	-moz-border-radius-topright: 1em;
+        -webkit-border-radius-topright: 1em;
+        -khtml-border-radius-topright: 1em;
+        border-radius-topright: 1em;
+}
+
+#hostinfo-td {
+/*	border-left:  1px solid #056560;;
+	border-top:  1px solid #@DARK_COLOR_HEX@;;
+	border-right:  1px solid #@DARK_COLOR_HEX@;; */
+	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+/*	-moz-border-radius-topleft: 1em;
+        -webkit-border-radius-topleft: 1em;
+        -khtml-border-radius-topleft: 1em;
+        border-radius-topleft: 1em;
+	*/
+	
+	padding-left: 10px;
+	padding-right: 10px;
+	padding-top: 10px;
+	text-align: left;
+
+	color: #@LIGHT_LABELS_HEX@; /*#0574B2;*/
+	font-weight: bold;
+	text-decoration: none;
+	font-size:large;
+}
+
+.expanded {
+/*	padding-left: 40px;*/
+    width: 100%;
+}
+
+
+
+/* main menu */
+
+#menu-td {
+	padding-right: 12px;
+}
+
+#main {
+	padding: 10px 20px;
+}
+
+
+#main-td {
+/*	padding: 10px 20px;*/
+/*	background-color: #baeaea;*/
+	background-color: #@LIGHT_COLOR_HEX@;
+	width: 100%;
+	/*border: 1px solid #056560;;*/
+	-moz-border-radius-bottomright: 1em;
+        -webkit-border-radius-bottomright: 1em;
+        -khtml-border-radius-bottomright: 1em;
+        border-radius-bottomright: 1em;
+	-moz-border-radius-bottomleft: 1em;
+        -webkit-border-radius-bottomleft: 1em;
+        -khtml-border-radius-bottomleft: 1em;
+        border-radius-bottomleft: 1em;
+}
+
+.menu-item-normal a {
+	font-weight: normal;
+	padding-left: 5px;
+	padding-right: 5px;
+	text-decoration: none;
+}
+
+.menu-item-selected a {
+	font-weight: bold;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
+.menu-group-name  {
+	padding-left: 5px;
+	padding-right: 5px;
+	color: #fff;
+	text-decoration: none;
+	/*background-color:#baeaea;*/
+	padding-top: 3px;
+	background: url(/design/images/gradient.png) 0% 0% repeat-x;
+	font-weight: bold;
+	-moz-border-radius-topright: 1em;
+	-webkit-border-radius-topright: 1em;
+	-khtml-border-radius-topright: 1em;
+	border-radius-topright: 1em;
+	-moz-border-radius-topleft: 1em;
+	-webkit-border-radius-topleft: 1em;
+	-khtml-border-radius-topleft: 1em;
+	border-radius-topleft: 1em;
+}
+
+.menu-group {
+	padding-bottom: 5px;
+	/*width:250px;*/
+/*	padding-right: 5px;*/
+	padding-top: 5px;
+	border-collapse: collapse;
+	background: url(/design/images/gradient-menu.png) 0% 0% repeat-x;
+/*	border-bottom: 1px solid #056560;;
+	border-left: 1px solid #@DARK_COLOR_HEX@;;
+	border-right: 1px solid #@DARK_COLOR_HEX@;; */
+	-moz-border-radius-bottomright: 1em;     /* mozilla 1.5 */
+	-webkit-border-radius-bottomright: 1em;  /* safari 3 */
+	-khtml-border-radius-bottomright: 1em;   /* Konqueror */
+	border-radius-bottomright: 1em;          /* CSS3 */
+	-moz-border-radius-bottomleft: 1em;     /* mozilla 1.5 */
+	-webkit-border-radius-bottomleft: 1em;  /* safari 3 */
+	-khtml-border-radius-bottomleft: 1em;   /* Konqueror */
+	border-radius-bottomleft: 1em;          /* CSS3 */
+}
+
+#help-popup {
+	padding-left: 10px;
+	width: 95%;
+	background-color: #@MIDDLE_COLOR_HEX@;
+/*	padding-right: 5px;
+	padding-top: 10px;*/
+}
+
+.hresizeable {
+	width: 100%;
+	height: 7px;
+	background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+	cursor: s-resize;
+}
+
+.hresizeable:hover {
+	background-color: #@DARK_COLOR_HEX@;
+}

bootloader/gfxboot.cfg.in

@@ -35,36 +35,37 @@ mainmenu.entries=8
 ; minimal main menu selection bar width
 mainmenu.bar.minwidth=300
 ; main menu selection bar transparency (0..255)
-mainmenu.bar.transparency=200
+mainmenu.bar.transparency=0
 ; main menu colors
-mainmenu.bar.color=0xffffff
-mainmenu.normal.fg=0xffffff
-mainmenu.selected.fg=0xffffff
+mainmenu.bar.color=0x798491
+mainmenu.normal.fg=0x000000
+mainmenu.selected.fg=0x@LIGHT_LABELS_HEX@
 ; boot option colors
-bootopt.label.fg=0xffffff
-bootopt.text.fg=0xffffff
+bootopt.label.fg=0x@DARK_LABELS_HEX@
+bootopt.text.fg=0x@DARK_LABELS_HEX@
 ; progress bar color
-progress.bar.color=0x@PROGRESS_COLOR@
+progress.bar.color=0x@MIDDLE_COLOR_HEX@
 ; menu colors
-menu.normal.bg=0xd8deed
-menu.normal.fg=0xffffff
-menu.selected.bg=0x6c6c6c
-menu.selected.fg=0xffffff
+menu.normal.bg=0x798491
+menu.normal.fg=0x@DARK_LABELS_HEX@
+menu.selected.bg=0x@LIGHT_COLOR_HEX@
+menu.selected.fg=0x@DARK_LABELS_HEX@
 ; window colors
 window.bg=0xd8deed
 window.fg=0x000000
 window.title.bg=0x@TITLE_COLOR@
-window.title.fg=0xffffff
+window.title.fg=0x@DARK_LABELS_HEX@
 window.title.error.bg=0xc00000
 ; help system colors
-help.link.fg=0x0000a0
+help.link.fg=0x@DARK_COLOR_HEX@
 help.link.selected.fg=0xffffff
-help.link.selected.bg=0x0000a0
-help.highlight.fg=0x009000
+help.link.selected.bg=0x@DARK_COLOR_HEX@
+help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
-panel.title.fg=0xffffff
-panel.f-key.fg=0xffe050
+panel.title.fg=0x5c6570
+panel.normal.fg=0x5c6570
+panel.f-key.fg=0x@DARK_LABELS_HEX@
 ; default keymap (e.g. de_DE, czech)
 keymap=
 

bootsplash/config/bootsplash-1024x768.cfg.in

@@ -32,10 +32,10 @@ box silent noover 99 387 701 378 #CBCBCC60
 
 
 
-box silent inter 100 371 100 377 #@INACTIVE_COLOR@
-box silent 100 371 700 377 #@INACTIVE_COLOR@
-box silent inter 100 377 100 387 #@PROGRESS_COLOR@ 
-box silent 100 377 700 387 #@PROGRESS_COLOR@
+box silent inter 100 371 100 377 #@LIGHT_COLOR_HEX@
+box silent 100 371 700 377 #@LIGHT_COLOR_HEX@
+box silent inter 100 377 100 387 #@DARK_COLOR_HEX@ 
+box silent 100 377 700 387 #@DARK_COLOR_HEX@
 
 
 trigger "isdown" quit

bootsplash/config/bootsplash-640x480.cfg.in

@@ -31,10 +31,10 @@ box silent noover 99 377 541 387 #9A9A9A60 #9A9A9A60 #D7D7D760 #D7D7D760
 box silent noover 99 387 541 378 #CBCBCC60
 
 
-box silent inter 100 371 100 377 #@INACTIVE_COLOR@
-box silent       100 371 540 377 #@INACTIVE_COLOR@
-box silent inter 100 377 100 387 #@PROGRESS_COLOR@
-box silent       100 377 540 387 #@PROGRESS_COLOR@
+box silent inter 100 371 100 377 #@LIGHT_COLOR_HEX@
+box silent       100 371 540 377 #@LIGHT_COLOR_HEX@
+box silent inter 100 377 100 387 #@DARK_COLOR_HEX@
+box silent       100 377 540 387 #@DARK_COLOR_HEX@
 
 
 trigger "isdown" quit

bootsplash/config/bootsplash-800x600.cfg.in

@@ -32,10 +32,10 @@ box silent noover 99 387 701 378 #CBCBCC60
 
 
 
-box silent inter 100 371 100 377 #@INACTIVE_COLOR@
-box silent 100 371 700 377 #@INACTIVE_COLOR@
-box silent inter 100 377 100 387 #@PROGRESS_COLOR@ 
-box silent 100 377 700 387 #@PROGRESS_COLOR@
+box silent inter 100 371 100 377 #@LIGHT_COLOR_HEX@
+box silent 100 371 700 377 #@LIGHT_COLOR_HEX@
+box silent inter 100 377 100 387 #@DARK_COLOR_HEX@ 
+box silent 100 377 700 387 #@DARK_COLOR_HEX@
 
 
 trigger "isdown" quit

branding.spec

@@ -9,7 +9,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt5
+Release: alt3
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -190,7 +190,6 @@ install theme.rcc %buildroot/usr/share/alterator-browser-qt/design/%theme.rcc
 
 mkdir -p %buildroot/usr/share/alterator/design/
 cp -a images %buildroot/usr/share/alterator/design/
-cp -a styles %buildroot/usr/share/alterator/design/
 popd
 
 mkdir -p %buildroot/%_altdir
@@ -265,7 +264,7 @@ echo $lang > lang
 %files alterator
 %config %_altdir/%name-browser-qt
 /usr/share/alterator-browser-qt/design/%theme.rcc
-/usr/share/alterator/design/*
+/usr/share/alterator/design/images
 
 
 %files bootsplash
@@ -289,12 +288,6 @@ echo $lang > lang
 %_desktopdir/*
 
 %changelog
-* Wed Apr 01 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt5
-- logo in www design fixed 
-
-* Tue Mar 31 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt4
-- www design fixed 
-
 * Tue Mar 31 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt3
 - conflicts for -alterator subpackages added
 - design for web alterator changed

color_dec

+#!/bin/bash
+echo $(echo "ibase=16; ${1:0:2}" | bc)','$(echo "ibase=16; ${1:2:2}" | bc)','$(echo "ibase=16; ${1:4:2}" | bc)
\ No newline at end of file

configure.ac

 AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
 
 
-PROGRESS_COLOR=`./fetch_color selectBackground`
+PROGRESS_COLOR=`./fetch_color selectBackground` //MIDDLE_COLOR_DEC
 TITLE_COLOR=`./fetch_color handle`
 INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
-
+LIGHT_COLOR_HEX=DFDFE0
+MIDDLE_COLOR_HEX=C8C9CB
+DARK_COLOR_HEX=909195
+LIGHT_LABELS_HEX=FFFFFF
+DARK_LABELS_HEX=000000
+LIGHT_COLOR_DEC=`./color_dec ${LIGHT_COLOR_HEX}`
+MIDDLE_COLOR_DEC=`./color_dec ${MIDDLE_COLOR_HEX}`
+DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
 
 AC_SUBST(THEME)
 AC_SUBST(NAME)
@@ -12,6 +19,14 @@ AC_SUBST(BRAND_FNAME)
 AC_SUBST(STATUS)
 AC_SUBST(VERSION)
 AC_SUBST(PROGRESS_COLOR)
+AC_SUBST(LIGHT_COLOR_HEX)
+AC_SUBST(MIDDLE_COLOR_HEX)
+AC_SUBST(DARK_COLOR_HEX)
+AC_SUBST(LIGHT_LABELS_HEX)
+AC_SUBST(DARK_LABELS_HEX)
+AC_SUBST(LIGHT_COLOR_DEC)
+AC_SUBST(MIDDLE_COLOR_DEC)
+AC_SUBST(DARK_COLOR_DEC)
 AC_SUBST(TITLE_COLOR)
 AC_SUBST(INACTIVE_COLOR)
 
@@ -21,6 +36,7 @@ AC_CONFIG_FILES([
 		 bootsplash/config/bootsplash-640x480.cfg
 		 bootsplash/config/bootsplash-800x600.cfg
 		 alterator/design/design.ini
+		 alterator/design/design.qss
 		 bootloader/gfxboot.cfg
 		 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
 		 notes/release-notes.ru.html
@@ -31,5 +47,8 @@ AC_CONFIG_FILES([
 		 indexhtml/index-ru.html
 		 indexhtml/index-uk.html
 		 indexhtml/index-en.html
+		 indexhtml/index.css
+		 alterator/styles/alterator.css
+		 alterator/styles/menu.css
 ])
 AC_OUTPUT

indexhtml/index.css → indexhtml/index.css.in

@@ -4,7 +4,7 @@ body {
 	font-family: Verdana,'DejaVu Sans',Helvetica,sans;
 	text-align:  left;
 	font-size: 12px;
-	background: #FFF;
+	background: #@LIGHT_COLOR_HEX@;
 	background-image: url('img/bg.png');
 }
 
@@ -66,7 +66,7 @@ div#content, div#lang {
 div#main {
     background: #FFF;
     width: 100%;
-	border: 1px solid #CCC;
+	border: 1px solid #@MIDDLE_COLOR_HEX@;
 	padding: 2mm;
 	padding-left: 5mm;
 }
@@ -80,17 +80,17 @@ div#pane {
 }
 
 div#team {
-	background: #E5FFE5;
+	background: #@MIDDLE_COLOR_HEX@;
 	width: 100%;
 	text-align: center;
 	margin: 0px;
 	padding: 0px;
-	border: 1px solid #66CC66;
+	border: 1px solid #@DARK_COLOR_HEX@;
 }
 
 .footer {
 	font-size: 9px;
-	color: #666;
+	color: #@DARK_COLOR_HEX@;
 }
 
 div.columns  { float: left; }
@@ -105,5 +105,5 @@ div#lang {
   text-align: center;
   background: #fff;
   padding: 0.2em;
-  border: 1px solid #CCC;
+  border: 1px solid #@DARK_COLOR_HEX@;
 }

kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc.in

@@ -17,9 +17,9 @@ inactiveBlend=242,241,241
 inactiveForeground=183,183,183
 inactiveFrame=149,201,212
 inactiveHandle=149,201,212
-inactiveTitleBtnBg=149,201,212
+inactiveTitleBtnBg=@LIGHT_COLOR_DEC@
 linkColor=0,0,192
-selectBackground=92,150,204
+selectBackground=@MIDDLE_COLOR_DEC@
 selectForeground=255,255,255
 shadeSortColumn=true
 visitedLinkColor=128,0,128