[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,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;