[merge] from upstream master

This commit is contained in:
amercader
2012-04-16 17:45:25 +02:00
21 changed files with 459 additions and 216 deletions

View File

@@ -1,14 +1,14 @@
.recline-graph-container .graph {
.recline-graph .graph {
height: 500px;
margin-right: 200px;
}
.recline-graph-container .legend table {
.recline-graph .legend table {
width: auto;
margin-bottom: 0;
}
.recline-graph-container .legend td {
.recline-graph .legend td {
padding: 5px;
line-height: 13px;
}
@@ -17,34 +17,34 @@
* Editor
*********************************************************/
.recline-graph-container .editor {
.recline-graph .editor {
float: right;
width: 200px;
padding-left: 0px;
}
.recline-graph-container .editor-info {
.recline-graph .editor-info {
padding-left: 4px;
}
.recline-graph-container .editor-info {
.recline-graph .editor-info {
cursor: pointer;
}
.recline-graph-container .editor form {
.recline-graph .editor form {
padding-left: 4px;
}
.recline-graph-container .editor select {
.recline-graph .editor select {
width: 100%;
}
.recline-graph-container .editor-info {
.recline-graph .editor-info {
border-bottom: 1px solid #ddd;
margin-bottom: 10px;
}
.recline-graph-container .editor-hide-info p {
.recline-graph .editor-hide-info p {
display: none;
}

View File

@@ -23,6 +23,10 @@
text-align: left;
}
.recline-grid td {
vertical-align: top;
}
.recline-grid tr td:first-child, .recline-grid tr th:first-child {
width: 20px;
}
@@ -63,10 +67,6 @@
float: right;
}
.read-only a.row-header-menu {
display: none;
}
div.data-table-cell-content {
line-height: 1.2;
color: #222;
@@ -301,15 +301,19 @@ td.expression-preview-value {
* Read-only mode
*********************************************************/
.read-only .no-hidden .recline-grid tr td:first-child,
.read-only .no-hidden .recline-grid tr th:first-child
.recline-read-only .no-hidden .recline-grid tr td:first-child,
.recline-read-only .no-hidden .recline-grid tr th:first-child
{
display: none;
}
.read-only .recline-grid .write-op,
.read-only .recline-grid a.data-table-cell-edit
.recline-read-only .recline-grid .write-op,
.recline-read-only .recline-grid a.data-table-cell-edit
{
display: none;
}
.recline-read-only a.row-header-menu {
display: none;
}

View File

@@ -1,4 +1,4 @@
.data-map-container .map {
.recline-map .map {
height: 500px;
}
@@ -6,22 +6,22 @@
* Editor
*********************************************************/
.data-map-container .editor {
.recline-map .editor {
float: right;
width: 200px;
padding-left: 0px;
margin-left: 10px;
}
.data-map-container .editor form {
.recline-map .editor form {
padding-left: 4px;
}
.data-map-container .editor select {
.recline-map .editor select {
width: 100%;
}
.data-map-container .editor .editor-options {
.recline-map .editor .editor-options {
margin-top: 10px;
border-top: 1px solid gray;
padding: 5px 0;