Commit 9cbcc7c7 authored by Andrey Cherepanov's avatar Andrey Cherepanov

Merge branch 'school-teacher' into school-junior

Conflicts: branding.spec images/product-logo.png
parents 95b83fb1 6e8b6d92
......@@ -16,7 +16,7 @@
Name: branding-%brand-%theme
Version: 6.9.9
Release: alt1
Release: alt3
BuildArch: noarch
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
......@@ -34,7 +34,6 @@ Group: Graphics
Summary: System/Base
License: GPLv2+
%description
Distro-specific packages with design and texts for %distro_name.
......@@ -75,7 +74,6 @@ PreReq: plymouth
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootsplash ";done )
%description bootsplash
This package contains graphics for boot process for %distro_name
(needs console splash screen enabled).
......@@ -96,7 +94,6 @@ Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
# lexicographically first of the village
Conflicts: branding-sisyphus-server-light-alterator
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-alterator ";done )
Obsoletes: design-alterator-server design-alterator-desktop design-altertor-browser-desktop design-altertor-browser-server branding-altlinux-backup-server-alterator
PreReq(post,preun): alternatives >= 0.2 alterator
......@@ -142,7 +139,6 @@ Obsoletes: %obsolete_list branding-alt-%theme-release
Conflicts: %conflicts_list
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-release ";done )
%description release
%distro_name release file.
......@@ -273,7 +269,6 @@ Group: Graphical desktop/Other
Requires(pre): altlinux-freedesktop-menu-common
Requires: altlinux-freedesktop-menu-common
%description menu
Menu for %distro_name
......@@ -517,6 +512,12 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
%config %_localstatedir/ldm/.pam_environment
%changelog
* Wed Dec 04 2013 Andrey Cherepanov <cas@altlinux.org> 6.9.9-alt3
- Fix favicon and product logo width in ahttpd
- Fix selection color and note font in GRUB theme
- Set more bright color for bootloader
- Disable border around section and nice yellow captions for installer
* Thu Nov 21 2013 Andrey Cherepanov <cas@altlinux.org> 6.9.9-alt1
- Update branding for Seven platform
......
components/ahttpd/images/product.png

3.53 KB | W: | H:

components/ahttpd/images/product.png

3.46 KB | W: | H:

components/ahttpd/images/product.png
components/ahttpd/images/product.png
components/ahttpd/images/product.png
components/ahttpd/images/product.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -767,7 +767,7 @@ div.alterator-accordion {
#product-logo {
background: url(/design/images/product-logo.png) no-repeat;
width: 348px;
width: 238px;
height: 52px;
border: 0px;
padding: 0px;
......
......@@ -39,30 +39,30 @@ mainmenu.bar.minwidth=294
; main menu selection bar transparency (0..255)
mainmenu.bar.transparency=0
; main menu colors
mainmenu.bar.color=0x001056
mainmenu.bar.color=0x0c2c6c
mainmenu.normal.fg=0x2b328d
mainmenu.selected.fg=0xffffff
; boot option colors
bootopt.label.fg=0x2b328d
bootopt.label.fg=0x001056
bootopt.text.fg=0x2b328d
; progress bar color
progress.bar.color=0x001056
progress.bar.color=0x@MIDDLE_COLOR_HEX@
; menu colors
menu.normal.bg=0xe9e8e7
menu.normal.fg=0x000000
menu.selected.bg=0xc9c8c8
menu.selected.fg=0x000000
menu.selected.bg=0x306ac4
menu.selected.fg=0xffffff
; window colors
window.bg=0xffffff
window.fg=0x000000
window.title.bg=0x787878
window.title.fg=0x000000
window.title.bg=0x@TITLE_COLOR@
window.title.fg=0xffffff
window.title.error.bg=0xc00000
; help system colors
help.link.fg=0x185da0
help.link.selected.fg=0xffffff
help.link.selected.bg=0x185da
help.highlight.fg=0x@DARK_COLOR_HEX@
help.highlight.fg=0x@MIDDLE_COLOR_HEX@
; panel colors
panel.fg=0x000000
panel.title.fg=0x001056
......
File mode changed from 100755 to 100644
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\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4, #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7, #eeece9, #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, #f8f7f6, #141312
Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@MIDDLE_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #f8f7f6, #141312
Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4, #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7, #eeece9, #000000, #f8f7f6, #141312
Style=Cleanlooks
......@@ -49,3 +49,8 @@ QProgressBar::chunk {
stop: 1 #6f9fca) url(:/design/progress-cleanlooks.png);
border: 1px solid #46647f;
}
/* Sections */
AWizardFace AGroupBox {
border: 1px solid rgba(255, 255, 255, 0%);
}
File mode changed from 100755 to 100644
......@@ -24,7 +24,7 @@
message-font: "DejaVu Sans Regular 12"
title-text: ""
message-color: "#000000"
message-bg-color: "#77b5f2"
message-bg-color: "#0c2c6c"
desktop-image: "boot.png"
terminal-font: "Misc Fixed Regular 13"
......@@ -36,8 +36,8 @@ terminal-font: "Misc Fixed Regular 13"
height = 25
text = "Для запуска системы выберите пункт меню и нажмите Enter."
align = "center"
font = "Droid Sans Bold 14"
color = "#008"
#font = "Droid Sans Bold 14"
color = "#0c2c6c"
}
+ label {
......@@ -47,8 +47,8 @@ terminal-font: "Misc Fixed Regular 13"
height = 25
text = "Для редактирования меню нажмите E. Для выхода - Esc."
align = "center"
font = "Droid Sans Bold 14"
color = "#008"
#font = "Droid Sans Bold 14"
color = "#0c2c6c"
}
#menu
......
AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
# 00a1e4
PROGRESS_COLOR=0093d7
TITLE_COLOR=5C96CC
LIGHT_COLOR_HEX=DFDFE0
MIDDLE_COLOR_HEX=C8C9CB
DARK_COLOR_HEX=909195
LIGHT_LABELS_HEX=FFFFFF
DARK_LABELS_HEX=000000
MIDDLE_LABELS_HEX=4d4d4f
INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
PROGRESS_COLOR=306ac4
TITLE_COLOR=306ac4
LIGHT_COLOR_HEX=F5F5F5 #new
MIDDLE_COLOR_HEX=306ac4 #new
DARK_COLOR_HEX=001056
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}`
DOCDIR=documentation
......@@ -53,5 +57,6 @@ AC_CONFIG_FILES([
components/indexhtml/index-en.html
components/systemd/os-release
components/ahttpd/styles/alterator.css
kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
])
AC_OUTPUT
[Color Scheme]
Name=@PRODUCT_NAME@
activeBackground=81,99,204
activeBlend=242,241,241
activeForeground=0,0,0
activeTitleBtnBg=149,201,212
alternateBackground=236,236,236
background=231,230,230
buttonBackground=231,230,230
buttonForeground=0,0,0
contrast=4
foreground=0,0,0
frame=92,150,204
handle=92,150,204
inactiveBackground=236,236,236
inactiveBlend=242,241,241
inactiveForeground=183,183,183
inactiveFrame=149,201,212
inactiveHandle=149,201,212
inactiveTitleBtnBg=@LIGHT_COLOR_DEC@
linkColor=0,0,192
selectBackground=@MIDDLE_COLOR_DEC@
selectForeground=255,255,255
shadeSortColumn=true
visitedLinkColor=128,0,128
windowBackground=255,255,255
windowForeground=0,0,0
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