From 98e11285b46fab722246c606bef1450b821012f5 Mon Sep 17 00:00:00 2001 From: Alexandra Panyukova Date: Fri, 3 Apr 2009 15:59:55 +0400 Subject: [PATCH] some new colors changed to gray --- alterator/design/design.ini.in | 4 ++-- bootloader/gfxboot.cfg.in | 12 ++++++------ bootsplash/config/bootsplash-1024x768.cfg.in | 8 ++++---- bootsplash/config/bootsplash-640x480.cfg.in | 8 ++++---- bootsplash/config/bootsplash-800x600.cfg.in | 8 ++++---- configure.ac | 2 +- indexhtml/index.css.in | 2 +- .../apps/kdisplay/color-schemes/scheme.kcsrc.in | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/alterator/design/design.ini.in b/alterator/design/design.ini.in index ed51314..9be8535 100644 --- a/alterator/design/design.ini.in +++ b/alterator/design/design.ini.in @@ -1,4 +1,4 @@ -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 diff --git a/bootloader/gfxboot.cfg.in b/bootloader/gfxboot.cfg.in index 4d7da42..cc318c1 100644 --- a/bootloader/gfxboot.cfg.in +++ b/bootloader/gfxboot.cfg.in @@ -44,9 +44,9 @@ mainmenu.selected.fg=0x@DARK_LABELS@ bootopt.label.fg=0x@LIGHT_COLOR_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.bg=0x798491 menu.normal.fg=0x@DARK_LABELS_HEX@ menu.selected.bg=0x798491 menu.selected.fg=0x@LIGHT_LABELS_HEX@ @@ -54,13 +54,13 @@ menu.selected.fg=0x@LIGHT_LABELS_HEX@ 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=0x5c6570 diff --git a/bootsplash/config/bootsplash-1024x768.cfg.in b/bootsplash/config/bootsplash-1024x768.cfg.in index 7f7aebd..719e4a2 100644 --- a/bootsplash/config/bootsplash-1024x768.cfg.in +++ b/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 #@MIDDLE_COLOR_HEX@ +box silent 100 377 700 387 #@MIDDLE_COLOR_HEX@ trigger "isdown" quit diff --git a/bootsplash/config/bootsplash-640x480.cfg.in b/bootsplash/config/bootsplash-640x480.cfg.in index 05443db..c006de5 100644 --- a/bootsplash/config/bootsplash-640x480.cfg.in +++ b/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 #@MIDDLE_COLOR_HEX@ +box silent 100 377 540 387 #@MIDDLE_COLOR_HEX@ trigger "isdown" quit diff --git a/bootsplash/config/bootsplash-800x600.cfg.in b/bootsplash/config/bootsplash-800x600.cfg.in index 7f7aebd..719e4a2 100644 --- a/bootsplash/config/bootsplash-800x600.cfg.in +++ b/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 #@MIDDLE_COLOR_HEX@ +box silent 100 377 700 387 #@MIDDLE_COLOR_HEX@ trigger "isdown" quit diff --git a/configure.ac b/configure.ac index 3df308f..3d6332e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ 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=DFDFFE0 diff --git a/indexhtml/index.css.in b/indexhtml/index.css.in index 5999237..65c630b 100644 --- a/indexhtml/index.css.in +++ b/indexhtml/index.css.in @@ -80,7 +80,7 @@ div#pane { } div#team { - background: #@LIGHT_COLOR_HEX@; + background: #@MIDDLE_COLOR_HEX@; width: 100%; text-align: center; margin: 0px; diff --git a/kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc.in b/kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc.in index 52abe91..8e20160 100644 --- a/kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc.in +++ b/kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc.in @@ -17,7 +17,7 @@ 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=@MIDDLE_COLOR_DEC@ selectForeground=255,255,255