Commit fd056c63 authored by Alexandra Panyukova's avatar Alexandra Panyukova

Merge remote branch 'inger/master' into P5

Conflicts: components/ahttpd/styles/alterator.css.in
parents 5fca737f 38172ca0
......@@ -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 {
......@@ -341,6 +325,29 @@ table.alterator-listbox tbody tr.odd td {
background-color:#@LIGHT_COLOR_HEX@;
}
table.alterator-listbox tbody tr.selected td, table.alterator-listbox tbody tr.odd.selected td {
background-color: #D0E1FF;
border-top: #ffffff solid 1px;
}
table.alterator-listbox tbody tr.error td {
background-color: #e6999b;
font-weight: bold;
}
table.alterator-listbox tbody tr.odd.error td {
background-color: #e68b8d;
font-weight: bold;
}
table.alterator-listbox tbody tr.working td {
background-color: #f2ecbd;
}
table.alterator-listbox tbody tr.odd.working td {
background-color: #f2e88f;
}
table.alterator-listbox thead tr .headerSortUp {
background-image: url(/design/images/asc.gif);
}
......@@ -380,6 +387,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 +459,20 @@ div.alterator-accordion h3.ui-state-active {
padding-right:10px;
margin-bottom:10px;
}
#help-popup {
padding-left: 10px;
width: 95%;
background-color: #@LIGHT_COLOR_HEX@;
}
.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@;
}
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