Commit 44d37797 authored by Alexandra Panyukova's avatar Alexandra Panyukova

label about technical preview;

some colors changed to gray
parent 9a434c03
...@@ -3,15 +3,15 @@ all: ...@@ -3,15 +3,15 @@ all:
cp -a bootloader/config design-bootloader-source/ 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-install/
cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/ 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 -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 27,27 "@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 27,27 "@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-boot/back.jpg
cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg
cp -al boot.jpg bootsplash/images/silent-1024x768.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 '800x600!' bootsplash/images/silent-1024x768.jpg bootsplash/images/silent-800x600.jpg
convert -resize '640x480!' bootsplash/images/silent-800x600.jpg bootsplash/images/silent-640x480.jpg convert -resize '640x480!' bootsplash/images/silent-800x600.jpg bootsplash/images/silent-640x480.jpg
# background # background
convert images/background.png -gravity northeast -pointsize 30 -annotate 0 '@STATUS@' background.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 27,27 "@STATUS@"' background.png
cp -al background.png graphics/backgrounds/default.png cp -al background.png graphics/backgrounds/default.png
cp -al background.png graphics/backgrounds/xdm.png cp -al background.png graphics/backgrounds/xdm.png
convert -resize '800x600!' background.png alterator/design/bg.png convert -resize '800x600!' background.png alterator/design/bg.png
......
...@@ -37,19 +37,19 @@ mainmenu.bar.minwidth=300 ...@@ -37,19 +37,19 @@ mainmenu.bar.minwidth=300
; main menu selection bar transparency (0..255) ; main menu selection bar transparency (0..255)
mainmenu.bar.transparency=200 mainmenu.bar.transparency=200
; main menu colors ; main menu colors
mainmenu.bar.color=0xffffff mainmenu.bar.color=0x@DARK_LABELS@
mainmenu.normal.fg=0xffffff mainmenu.normal.fg=0x000000
mainmenu.selected.fg=0xffffff mainmenu.selected.fg=0x@DARK_LABELS@
; boot option colors ; boot option colors
bootopt.label.fg=0xffffff bootopt.label.fg=0x@LIGHT_COLOR_HEX@
bootopt.text.fg=0xffffff bootopt.text.fg=0x@DARK_LABELS_HEX@
; progress bar color ; progress bar color
progress.bar.color=0x@PROGRESS_COLOR@ progress.bar.color=0x@PROGRESS_COLOR@
; menu colors ; menu colors
menu.normal.bg=0xd8deed menu.normal.bg=0xd8deed
menu.normal.fg=0xffffff menu.normal.fg=0x@DARK_LABELS_HEX@
menu.selected.bg=0x6c6c6c menu.selected.bg=0x798491
menu.selected.fg=0xffffff menu.selected.fg=0x@LIGHT_LABELS_HEX@
; window colors ; window colors
window.bg=0xd8deed window.bg=0xd8deed
window.fg=0x000000 window.fg=0x000000
...@@ -63,8 +63,8 @@ help.link.selected.bg=0x0000a0 ...@@ -63,8 +63,8 @@ help.link.selected.bg=0x0000a0
help.highlight.fg=0x009000 help.highlight.fg=0x009000
; panel colors ; panel colors
panel.fg=0x000000 panel.fg=0x000000
panel.title.fg=0xffffff panel.title.fg=0x5c6570
panel.f-key.fg=0xffe050 panel.f-key.fg=0x@DARK_LABELS_HEX@
; default keymap (e.g. de_DE, czech) ; default keymap (e.g. de_DE, czech)
keymap= keymap=
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%define codename Inula Helenium %define codename Inula Helenium
%define brand altlinux %define brand altlinux
%define Brand ALT Linux %define Brand ALT Linux
%define status beta %define status ПРОТОТИП
%define variants altlinux-office-desktop altlinux-office-server altlinux-lite %define variants altlinux-office-desktop altlinux-office-server altlinux-lite
Name: branding-%brand-%theme Name: branding-%brand-%theme
......
...@@ -7,6 +7,8 @@ INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg` ...@@ -7,6 +7,8 @@ INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
LIGHT_COLOR_HEX="DFDFFE0" LIGHT_COLOR_HEX="DFDFFE0"
MIDDLE_COLOR_HEX="C8C9CB" MIDDLE_COLOR_HEX="C8C9CB"
DARK_COLOR_HEX="909195" DARK_COLOR_HEX="909195"
LIGHT_LABELS_HEX="FFFFFF"
DARK_LABELS_HEX="000000"
LIGHT_COLOR_DEC=`./color-dec $LIGHT_COLOR_HEX` LIGHT_COLOR_DEC=`./color-dec $LIGHT_COLOR_HEX`
MIDDLE_COLOR_DEC=`./color-dec $MIDDLE_COLOR_HEX` MIDDLE_COLOR_DEC=`./color-dec $MIDDLE_COLOR_HEX`
DARK_COLOR_DEC=`./color-dec $DARK_COLOR_HEX` DARK_COLOR_DEC=`./color-dec $DARK_COLOR_HEX`
...@@ -40,5 +42,6 @@ AC_CONFIG_FILES([ ...@@ -40,5 +42,6 @@ AC_CONFIG_FILES([
indexhtml/index-ru.html indexhtml/index-ru.html
indexhtml/index-uk.html indexhtml/index-uk.html
indexhtml/index-en.html indexhtml/index-en.html
indexhtml/index.css.in
]) ])
AC_OUTPUT AC_OUTPUT
...@@ -4,7 +4,7 @@ body { ...@@ -4,7 +4,7 @@ body {
font-family: Verdana,'DejaVu Sans',Helvetica,sans; font-family: Verdana,'DejaVu Sans',Helvetica,sans;
text-align: left; text-align: left;
font-size: 12px; font-size: 12px;
background: #FFF; background: #@LIGHT_COLOR_HEX@;
background-image: url('img/bg.png'); background-image: url('img/bg.png');
} }
...@@ -66,7 +66,7 @@ div#content, div#lang { ...@@ -66,7 +66,7 @@ div#content, div#lang {
div#main { div#main {
background: #FFF; background: #FFF;
width: 100%; width: 100%;
border: 1px solid #CCC; border: 1px solid #@MIDDLE_COLOR_HEX@;
padding: 2mm; padding: 2mm;
padding-left: 5mm; padding-left: 5mm;
} }
...@@ -80,17 +80,17 @@ div#pane { ...@@ -80,17 +80,17 @@ div#pane {
} }
div#team { div#team {
background: #E5FFE5; background: #@LIGHT_COLOR_HEX@;
width: 100%; width: 100%;
text-align: center; text-align: center;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
border: 1px solid #66CC66; border: 1px solid #@DARK_COLOR_HEX@;
} }
.footer { .footer {
font-size: 9px; font-size: 9px;
color: #666; color: #@DARK_COLOR_HEX@;
} }
div.columns { float: left; } div.columns { float: left; }
...@@ -105,5 +105,5 @@ div#lang { ...@@ -105,5 +105,5 @@ div#lang {
text-align: center; text-align: center;
background: #fff; background: #fff;
padding: 0.2em; padding: 0.2em;
border: 1px solid #CCC; border: 1px solid #@DARK_COLOR_HEX@;
} }
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