Merge remote branch 'inger/office-server' into P5

branding.spec

@@ -9,7 +9,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt31
+Release: alt33
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -299,10 +299,17 @@ echo $lang > lang
 %_desktopdir/indexhtml.desktop
 
 %changelog
-* Tue Oct 13 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt31
+* Tue Oct 13 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt33
 - colors of inactive buttons fixed
 - color of progress bar in bootloader fixed
 
+* Mon Oct 12 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt32
+- add classes for color rows in table.alterator-listbox
+
+* Thu Oct 08 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt31
+- add classes: close-dialog-button, help-button, and resizeable
+- add svg image for close-dialog-button
+
 * Fri Oct 02 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt30
 - not using indexhtml-ua anymore
 - new logo

components/ahttpd/styles/alterator.css.in

@@ -71,13 +71,16 @@ textarea, select, input.text {
     width: 780px;
     margin-top: 10px;
 
-    background: #FFFFFF;
-    padding: 0.2em;
-    padding-right: 2mm;
-    padding-top: 2mm;
-    padding-bottom: 2mm;
+    padding: 10px 20px;
+    padding-top: 10px;
 
-    border: 1px solid #@MIDDLE_COLOR_HEX@;
+    background-color: #@LIGHT_COLOR_HEX@;
+    border: 1px solid #@DARK_COLOR_HEX@;;
+
+    -moz-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    -khtml-border-radius: 0.5em;
+    border-radius: 0.5em;
 }
 
 .disabled {
@@ -410,6 +413,14 @@ div.alterator-accordion h3.ui-state-active {
 
 .ui-help-button {
 	background-color: #@LIGHT_COLOR_HEX@;
+	margin-bottom: 10px;
+	padding-top: 7px;
+
+	border: 1px solid #@DARK_COLOR_HEX@;;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
 }
 
 .ui-help-button-content {
@@ -465,9 +476,15 @@ div.alterator-accordion h3.ui-state-active {
 }
 
 #help-popup {
-       padding-left: 10px;
-       width: 95%;
-       background-color: #@LIGHT_COLOR_HEX@;
+	padding-left: 10px;
+	padding-right: -30px;
+	background-color: #@LIGHT_COLOR_HEX@;
+
+        border: 1px solid #@DARK_COLOR_HEX@;;
+        -moz-border-radius: 0.5em;
+        -webkit-border-radius: 0.5em;
+        -khtml-border-radius: 0.5em;
+        border-radius: 0.5em;
 }
 
 .hresizeable {