Skip to content

B
branding-etersoft-ximper
Commit f61fa4ef authored by Sergey V Turchin's avatar Sergey V Turchin
Browse files
Options

Merge remote-tracking branch 'boyarsh/centaurus' into kdesktop

Conflicts: branding.spec notes/release-notes.ru.html.in
parents dca53765 62fa41ad
Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 122 deletions
branding.spec
View file @ f61fa4ef
......@@ -5,9 +5,15 @@
%define variants altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
<<<<<<< HEAD
Name: branding-%brand-kdesktop
Version: 6.0.0
Release: alt6
=======
Name: branding-%brand-%theme
Version: 6.0.0
Release: alt2
>>>>>>> boyarsh/centaurus
BuildArch: noarch
%define theme %name
......@@ -314,6 +320,8 @@ echo $lang > lang
[ "$lang" = "C" ] || echo lang | cpio -o --append -F message
. shell-config
shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.txt
shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal
shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
%preun bootloader
......@@ -393,6 +401,11 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
%changelog
* Mon Feb 07 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt6
- update kdm4 color scheme
- import last changes from centaurus branding
* Thu Feb 03 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt2
- install menu position changed
- web design from mex3@
* Tue Feb 01 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt5
- import last changes from centaurus branding
......
components/ahttpd/images/clock-face.png
View replaced file @ dca53765 View file @ f61fa4ef
components/ahttpd/images/clock-face.png

19.5 KB | W: | H:

components/ahttpd/images/clock-face.png

29.4 KB | W: | H:

components/ahttpd/images/clock-face.png
components/ahttpd/images/clock-face.png
components/ahttpd/images/clock-face.png
components/ahttpd/images/clock-face.png
  • 2-up
  • Swipe
  • Onion skin
components/ahttpd/styles/alterator.css.in
View file @ f61fa4ef
/* basic elements and widgets */
body {
background-color: #@MIDDLE_COLOR_HEX@;
color: #@MIDDLE_LABELS_HEX@;
background-color: #@LIGHT_COLOR_HEX@;
color: #@DARK_LABELS_HEX@;
margin: 0px;
padding: 10px;
font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
......@@ -10,52 +10,99 @@ body {
}
a {
color: #@MIDDLE_LABELS_HEX@;
color: #@DARK_LABELS_HEX@;
font-weight: bold;
}
table {
font-size: 9pt;
border-color: #@MIDDLE_LABELS_HEX@;
border-collapse: collapse;
border-color: #@MIDDLE_COLOR_HEX@;
border-spacing: 0px;
/* border-collapse: collapse;*/
}
th {
padding: 0px 7px 3px 0px;
}
/*tr:nth-child(even) {background: #eaecf2}
tr:nth-child(odd) {background: #FFF}*/
tr {
vertical-align: top;
}
hr {
border: none;
border-top: 1px solid #@MIDDLE_LABELS_HEX@;;
border-top: 1px solid #415E6F;;
}
h1 {
text-align: center;
margin: 0px;
color: #@DARK_LABELS_HEX@;
}
h2 {
color: #@DARK_LABELS_HEX@;
}
h3 {
color: #@DARK_LABELS_HEX@;
}
textarea, select, input.text {
border: 1px solid #@MIDDLE_LABELS_HEX@;
/*border: 1px solid #e2e6eb; #MIDDLE_LABELS_HEX@;*/ /*FIX NEEDED!!!!!*/
font-size: 8pt;
margin: 1px 3px 1px 0px;
padding: 1px 3px;
border-color: #c1c3cb;
-moz-border-radius: 0.3em;
-webkit-border-radius: 0.3em;
-khtml-border-radius: 0.3em;
border-radius: 0.3em;
background-color: #eaecf2;
}
input.text[disabled], select[disabled]{
background-color: #e2e6eb;
}
.disabled{
color:#@MIDDLE_LABELS_HEX@;
}
.btn, button {
background-color: #@MIDDLE_COLOR_HEX@;
color: #@MIDDLE_LABELS_HEX@;
border: 1px solid #@MIDDLE_LABELS_HEX@;
background-image: url(/design/images/button-active.png);
background-repeat:repeat-x;
color: #@DARK_LABELS_HEX@;
border: 1px solid #@MIDDLE_COLOR_HEX@;
-moz-border-radius: 0.7em;
-webkit-border-radius: 0.7em;
-khtml-border-radius: 0.7em;
border-radius: 0.7em;
cursor: pointer;
font-size: 9pt;
padding: 0px 3px;
padding: 2.5px 10px;
-moz-box-shadow: 5px 5px 6px #a6a6a6;
-webkit-box-shadow: 5px 5px 6px #a6a6a6;
box-shadow: 5px 5px 6px #a6a6a6;
}
.btn:hover, button:hover {
background-color: #@LIGHT_COLOR_HEX@;
background-image: url(/design/images/button-passive.png);
background-repeat:repeat-x;
color: #@LIGHT_LABELS_HEX@;
border: 1px solid #@DARK_LABELS_HEX@;
}
.box {
......@@ -63,30 +110,11 @@ textarea, select, input.text {
width: 780px;
margin-top: 10px;
background: #FFFFFF;
padding: 0.2em;
padding-right: 2mm;
padding-top: 2mm;
padding-bottom: 2mm;
border: 1px solid #@MIDDLE_COLOR_HEX@;
}
.disabled {
color: #@DARK_COLOR_HEX@;
}
.alterator-progress {
border: 1px solid #@MIDDLE_LABELS_HEX@;
height: 20px;
width: 200px;
padding: 2px;
background-color: #@LIGHT_LABELS_HEX@;
}
padding: 10px 20px;
padding-top: 10px;
.alterator-progress div {
background-color: #@MIDDLE_LABELS_HEX@;
height: 20px;
background-color: #cfd4e3;
border: 1px solid #@SHADOW_HEX@;
}
.next-page-button,.prev-page-button,.first-page-button,.last-page-button {
......@@ -164,7 +192,15 @@ canvas.alterator-clock {
.year {
font-weight: bold;
background-color: #@LIGHT_COLOR_HEX@;
color:#@DARK_LABELS_HEX@;
font-size:10pt;
/*background-color: #F4F8F9;*/
}
.month {
font-weight:bold;
color:#@DARK_LABELS_HEX@;
font-size:10pt;
}
.week {
......@@ -174,16 +210,19 @@ canvas.alterator-clock {
}
.today {
border-style:solid;
border-width:1px;
background-color: pink;
border: 1px solid #@DARK_LABELS_HEX@;
cursor: pointer;
background-image: url(/design/images/button-passive.png);
background-repeat:repeat-x;
color: #FFFFFF;
}
.day {
border-style:solid;
border-width:1px;
background-color: #@LIGHT_COLOR_HEX@;
background-color: #@LIGHT_LABELS_HEX@;
cursor: pointer;
}
......@@ -194,9 +233,31 @@ canvas.alterator-clock {
.alterator-dateedit-calendar table {
width: 100%;
text-align: center;
background-color: #@LIGHT_COLOR_HEX@;
border-style: solid;
border-width: 1px;
background-image: url(/design/images/table-header.png);
background-repeat:repeat-x;
-webkit-border-top-left-radius: 0.7em;
-webkit-border-top-right-radius: 0.7em;
-moz-border-radius-topleft: 0.7em;
-moz-border-radius-topright: 0.7em;
border-top-left-radius: 0.7em;
border-top-right-radius: 0.7em;
/*border-width: 2px;
border-style: solid;
border-color: #242a60;*/
border-collapse: collapse;
/*
-moz-border-radius-topright: 0.7em;
-webkit-border-top-right-radius: 0.7em;
-khtml-border-radius-topright: 0.7em;
border-top-right-radius: 0.7em;
-webkit-border-top-right-radius: 4px;
*/
-moz-box-shadow: 0 0 8px 0.2em #a6a6a6;
-webkit-box-shadow: 0 0 8px 0.2em #a6a6a6;
box-shadow: 0 0 8px 0.2em #a6a6a6;
}
.alterator-dateedit-calendar td {
......@@ -206,67 +267,88 @@ canvas.alterator-clock {
.alterator-dateedit-button {
vertical-align:middle;
cursor:pointer;
background: url(/design/images/dateedit.png) no-repeat;
width: 15px;
height: 16px;
}
/* main menu */
#menu-td {
padding-right: 12px;
}
#main {
#main, #box {
padding: 10px 20px;
padding-top: 10px;
background-color: #cfd4e3;
border: 1px solid #@MIDDLE_COLOR_HEX@;
}
#main-td {
background-color: #ffffff;
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;
padding-top: 10px;
}
#menu-td {
padding-right: 10px;
padding-top: 10px;
}
#menu {
/*padding: 10px;*/
background-color: white;
border: 1px solid #c1c3cb;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
-khtml-border-radius: 7px;
border-radius: 7px;
}
.menu-item-normal a {
font-weight: normal;
padding-left: 5px;
padding-right: 5px;
text-decoration: none;
color: #@DARK_LABELS_HEX@;
}
.menu-item-selected a {
font-weight: bold;
padding-left: 5px;
padding-right: 5px;
text-decoration: none;
color: #@DARK_LABELS_HEX@;
padding-top: 10px;
margin-top: 10px;
width: 200px;
}
.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;
.menu-item-normal {
padding-left: 20px;
width: 100%;
padding-right: 4px;
margin-top: 3px;
margin-bottom: 2px;
}
.menu-group {
padding-bottom: 5px;
/*width:250px;*/
padding-top: 5px;
border-collapse: collapse;
background: url(/design/images/gradient-menu.png) 0% 0% repeat-x;
.menu-item-selected {
background-image: url(/design/images/menu-selected.png);
background-repeat:repeat-y;
padding-left: 20px;
width: 80%;
padding-top: 3px;
padding-bottom: 3px;
padding-right: 3px;
margin-top: 3px;
margin-bottom: 2px;
}
.menu-group-name {
color: #@DARK_LABELS_HEX@;
background-image: url(/design/images/menu-header.png);
background-repeat:repeat-x;
font-size: 10pt;
padding-top: 3px;
padding-bottom: 3px;
padding-right: 4px;
padding-left: 10px;
margin: 10px;
}
/* tables */
......@@ -276,14 +358,35 @@ table.alterator-listbox {
font-size: 8pt;
width: 100%;
text-align: left;
border: solid 1px;
/* border: solid 1px;*/
-webkit-border-top-left-radius: 0.7em;
-webkit-border-top-right-radius: 0.7em;
-moz-border-radius-topleft: 0.7em;
-moz-border-radius-topright: 0.7em;
border-top-left-radius: 0.7em;
border-top-right-radius: 0.7em;
border-style:solid;
border-color:#242a60;
border-width: 1px;
border-spacing:0px;
background-image: url(/design/images/table-header.png);
background-repeat:repeat-x;
}
table.alterator-listbox thead tr th, table.alterator-listbox tfoot tr th {
background-color: #@MIDDLE_COLOR_HEX@;
/*border-collapse: separate;
border: solid 1px;
border-right-color:#242a60;
border-right: 1px solid #242a60;*/
font-size: 8pt;
margin: 0px;
padding: 4px;
color: #@DARK_LABELS_HEX@;
}
table.alterator-listbox thead tr .header {
......@@ -292,24 +395,30 @@ table.alterator-listbox thead tr .header {
background-position: center right;
cursor: pointer;
padding-right: 24px;
border-right: #@MIDDLE_COLOR_HEX@ solid 1px;
}
table.alterator-listbox tbody td {
color: #@DARK_COLOR_HEX@;
padding: 4px;
background-color: #FFF;
background-color: #@LIGHT_LABELS_HEX@;
vertical-align: top;
border-left: solid 1px;
/*border-left: solid 1px;
border-right: solid 1px;
border:none;*/
border-right: #@MIDDLE_COLOR_HEX@ solid 1px;
}
table.alterator-listbox tbody tr.odd td {
background-color:#@LIGHT_COLOR_HEX@;
background-color:#eaecf2;
/*border:none;*/
}
table.alterator-listbox tbody tr.selected td, table.alterator-listbox tbody tr.odd.selected td {
background-color: #D0E1FF;
border-top: #ffffff solid 1px;
/*border-top: #ffffff solid 1px; WTF??*/
}
table.alterator-listbox tbody tr.error td {
......@@ -339,13 +448,40 @@ table.alterator-listbox thead tr .headerSortDown {
}
table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead tr .headerSortUp {
background-color: #@LIGHT_COLOR_HEX@;
background-color: #@LIGHT_LABELS_HEX@;
}
/* states */
.ui-state-disabled {
cursor: default !important;
color: #c3c7cb;
background-color: #e2e6eb;
}
.btn.ui-state-disabled {
color: #415E6F;
background-color: #E2E6EB;
}
.btn.ui-state-disabled:hover {
background-color: #E2E6EB;
}
/* progressbar */
.ui-progressbar {
height:20px;
text-align: left;
}
.ui-progressbar .ui-progressbar-value {
height:100%;
}
/* accordion */
div.alterator-accordion h3 {
background-color: #@MIDDLE_COLOR_HEX@;
background-color: #eaecf2;
font-size: 9pt;
padding-top: 3px;
......@@ -372,11 +508,11 @@ div.alterator-accordion h3.ui-state-active {
width: 100%;
bottom: 0px;
left: 0px;
background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
background:#E2E6EB url(/design/images/hgrabber.gif) no-repeat scroll 45%;
}
.ui-resizable-s:hover {
background-color: #@DARK_COLOR_HEX@;
background-color: #1B3664;
}
......@@ -431,8 +567,8 @@ div.alterator-accordion h3.ui-state-active {
}
.ui-corner-all {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 0.8em;
-webkit-border-radius: 0.8em;
}
/* overlays */
......@@ -451,15 +587,13 @@ div.alterator-accordion h3.ui-state-active {
/* dialog */
.ui-widget-content {
border: 1px solid #aaaaaa;
background: #ffffff;
color: #222222
background-color: #@LIGHT_LABELS_HEX@;
border: 1px solid #@MIDDLE_COLOR_HEX@;
}
.ui-widget-header {
border: 1px solid #aaaaaa;
background: url(/design/images/gradient.png) 0% 0% repeat-x;
color: #ffffff;
color: #EAEDEF;
background-color: #@MIDDLE_COLOR_HEX@;
font-weight: bold;
}
......@@ -525,7 +659,15 @@ div.alterator-accordion h3.ui-state-active {
/* help button */
.ui-help-button {
background-color: #@LIGHT_COLOR_HEX@;
background-color: #@LIGHT_LABELS_HEX@;
margin-bottom: 10px;
padding-top: 7px;
border: 1px solid #c1c3cb;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
}
.ui-help-button-content {
......@@ -537,15 +679,19 @@ div.alterator-accordion h3.ui-state-active {
#top {
text-align:left;
background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
padding: 0.25em;
background: url(/design/images/header-gradient.png) repeat-x;
padding: 0em;
margin-bottom: 0px;
}
#product-logo {
background: url(/design/images/product-logo.png) no-repeat;
width: 275px;
height: 30px;
width: 521px;
height: 58px;
border: 0px;
padding: 0px;
margin: 0px;
}
#title {
......@@ -553,6 +699,7 @@ div.alterator-accordion h3.ui-state-active {
padding-right: 1em;
text-align: left;
color: #@DARK_LABELS_HEX@;
font-weight: bold;
text-decoration: none;
font-size:large;
......@@ -566,26 +713,32 @@ div.alterator-accordion h3.ui-state-active {
/* deprecated */
.error-message {
background-color: #FFCACA;
border: 1px solid #FF6060;
background-color: #efc9d3;
border: 1px solid #f81751;
padding-left:10px;
padding-right:10px;
margin-bottom:10px;
}
#help-popup {
padding-left: 10px;
width: 95%;
background-color: #@LIGHT_COLOR_HEX@;
padding-left: 10px;
padding-right: -30px;
background-color: #@LIGHT_LABELS_HEX@;
border: 1px solid #c1c3cb;
-moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em;
-khtml-border-radius: 0.5em;
border-radius: 0.5em;
}
.hresizeable {
width: 100%;
height: 7px;
background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
background:#@DARK_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
cursor: s-resize;
}
.hresizeable:hover {
background-color: #@DARK_COLOR_HEX@;
background-color: #@MIDDLE_COLOR_HEX@;
}
components/bootloader/gfxboot.cfg.in
View file @ f61fa4ef
......@@ -75,7 +75,7 @@ keymap=
; screen size
screen.size=800,600
; upper left corner
mainmenu.pos=253,230
mainmenu.pos=253,210
; boot option input field position
bootopt.pos=200,480
......
configure.ac
View file @ f61fa4ef
......@@ -4,12 +4,13 @@ AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
PROGRESS_COLOR=`./fetch_color selectBackground` #MIDDLE_COLOR_DEC
TITLE_COLOR=`./fetch_color handle`
INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
LIGHT_COLOR_HEX=FFFFFF
MIDDLE_COLOR_HEX=8DA6DA
LIGHT_COLOR_HEX=F5F5F5 #new
MIDDLE_COLOR_HEX=c1c3cb #new
DARK_COLOR_HEX=001056
LIGHT_LABELS_HEX=FFFFFF
DARK_LABELS_HEX=000000
MIDDLE_LABELS_HEX=4d4d4f
LIGHT_LABELS_HEX=FFFFFF #new
DARK_LABELS_HEX=242a60 #mew
MIDDLE_LABELS_HEX=666666 #new
SHADOW_HEX=A6A6A6
LIGHT_COLOR_DEC=`./color_dec ${LIGHT_COLOR_HEX}`
MIDDLE_COLOR_DEC=`./color_dec ${MIDDLE_COLOR_HEX}`
DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
......
notes/license.ru.html.in
View file @ f61fa4ef
......@@ -6,13 +6,13 @@
<body>
<h1>Лицензионный договор</h1>
<h2>на программное обеспечение Альт Линукс 5.0 Ковчег Рабочая Станция и включенные в него программы для ЭВМ</h2>
<h2>на программное обеспечение Альт Линукс 6.0 Кентавр и включенные в него программы для ЭВМ</h2>
<p><b>1. Сведения о договоре</b></p>
<p>1.1 Участники договора</p>
<p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение
<strong>Альт Линукс 5.0 Ковчег Рабочая Станция</strong>
<strong>Альт Линукс 6.0 Кентавр</strong>
(далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>
<p>1.2 Предмет договора</p>
......
notes/release-notes.ru.html.in
View file @ f61fa4ef
......@@ -12,12 +12,6 @@
узнать больше о возможностях продукта.
</p>
<p>
Уже сейчас вы можете приступать к работе — создавать и редактировать
документы в офисном пакете, работать в интернете, с музыкальными
и графическими файлами, а также многое-многое другое. Изучите меню
подробнее — вы найдете много новых полезных программ.
</p>
<p>
<em>Совет</em>: Обязательно посетите наш фирменный интернет-магазин
<a href="http://shop.altlinux.ru">shop.altlinux.ru</a>. В нем
представлен весь ассортимент продуктов и услуг ALT Linux, много
......
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