diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-05-29 13:14:14 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-05-29 13:14:14 +0200 |
| commit | 412a8a7b8822620c632d8ca61ac3e1c37f3e88f8 (patch) | |
| tree | 70f19ff1826bef24b26b6b4676b829a1eff680ca /chimere/static | |
| parent | 6f29dd35427e04bdb309c7ac3fccb12843a9056c (diff) | |
| parent | 83e07ebac66a5be0d6ef00b159d306fa237f2106 (diff) | |
| download | Chimère-412a8a7b8822620c632d8ca61ac3e1c37f3e88f8.tar.bz2 Chimère-412a8a7b8822620c632d8ca61ac3e1c37f3e88f8.zip | |
Merge branch 'v2.0'
Conflicts:
chimere/widgets.py
Diffstat (limited to 'chimere/static')
| -rw-r--r-- | chimere/static/chimere/css/forms.css | 5 | ||||
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chimere/static/chimere/css/forms.css b/chimere/static/chimere/css/forms.css index a763a34..7ceaa58 100644 --- a/chimere/static/chimere/css/forms.css +++ b/chimere/static/chimere/css/forms.css @@ -71,6 +71,11 @@ div.bottomform{ float:left; } +#live_lonlat p{ + display:inline-table; + margin-left:0; +} + .toggle-button{ margin:4px 0; padding:2px 0; diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 764e0c7..ea7d4c0 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -756,10 +756,6 @@ table.inline-table td input[type=file]{ width:260px; } -#live_lonlat { - display:none; -} - #live_lonlat p{ display:inline-table; } |