Merge branch 'master' into office-server

components/ahttpd/styles/alterator.css.in

@@ -66,17 +66,18 @@ textarea, select, input.text {
 	background-color: #@MIDDLE_LABELS_HEX@;
 }
 
+.box {
+    position: relative;
+    width: 780px;
+    margin-top: 10px;
 
-.frame-table {
-	border-style:solid;
-	border-width:1px;
-	margin: 3px;
-}
+    background: #FFFFFF;
+    padding: 0.2em;
+    padding-right: 2mm;
+    padding-top: 2mm;
+    padding-bottom: 2mm;
 
-.frame-table td, .frame-table th {
-	border-style:solid;
-	border-width:1px;
-	padding: 1px 1px 3px 3px;
+    border: 1px solid #@MIDDLE_COLOR_HEX@;
 }
 
 .disabled {
@@ -120,6 +121,14 @@ textarea, select, input.text {
     background: url(/design/images/last-page-button.png) no-repeat;
 }
 
+.close-dialog-button {
+	width: 22px;
+	height: 22px;
+	border: 0px;
+	cursor: pointer;
+	background: url(/design/images/close-dialog-button.png) no-repeat;
+}
+
 /* messages */
 
 .alterator-information-message {
@@ -277,31 +286,6 @@ canvas.alterator-clock {
 	border-radius: 4px;
 }
 
-/* help popup */
-
-#help-popup {
-	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 {
-	width: 100%;
-	height: 7px;
-	background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
-	cursor: s-resize;
-}
-
-.hresizeable:hover {
-	background-color: #@DARK_COLOR_HEX@;
-}
-
 /* tables */
 
 table.alterator-listbox {
@@ -380,6 +364,32 @@ div.alterator-accordion h3.ui-state-active {
 	background-image: url(/design/images/asc.gif);
 }
 
+/* resizeable */
+
+.ui-resizable-s {
+    cursor: s-resize;
+    height: 7px;
+    width: 100%;
+    bottom: 0px;
+    left: 0px;
+    background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+}
+
+.ui-resizable-s:hover {
+	background-color: #@DARK_COLOR_HEX@;
+}
+
+/* help button */
+
+.ui-help-button {
+	background-color: #@LIGHT_COLOR_HEX@;
+}
+
+.ui-help-button-content {
+	padding-left: 10px;
+	padding-right: 30px;
+}
+
 /* top line */
 
 #top {
@@ -426,3 +436,26 @@ div.alterator-accordion h3.ui-state-active {
 	padding-right:10px;
 	margin-bottom:10px;
 }
+
+#help-popup {
+	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 {
+	width: 100%;
+	height: 7px;
+	background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+	cursor: s-resize;
+}
+
+.hresizeable:hover {
+	background-color: #@DARK_COLOR_HEX@;
+}