diff options
| author | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
| commit | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (patch) | |
| tree | 477f3a8e84388aab2a4f3c938a166597c7467d19 /view/css | |
| parent | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (diff) | |
| parent | 247579ebf13ead372eee87bd2351078f7219321e (diff) | |
| download | volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.gz volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.bz2 volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.zip | |
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
Diffstat (limited to 'view/css')
| -rw-r--r-- | view/css/mod_events.css | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/view/css/mod_events.css b/view/css/mod_events.css index 4c418340a..53432271b 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -1,15 +1,16 @@ + #event-desc-textarea, #event-location-textarea { - width: 400px; + width: 400px; } #event-summary-text, #event-start-text, #event-finish-text { - width: 200px; - float: left; + width: 200px; + float: left; } #event-summary, #start_text, #finish_text { - width: 300px; - float: left; + width: 300px; + float: left; } #event-category-wrap { @@ -18,18 +19,23 @@ .event-cats { margin-top: 15px; - width: 400px; + width: 400px; } .required { - float: left; + float: left; } #event-datetime-break { - clear: both; + clear: both; } + #event-nofinish-break { - margin-bottom: 10px; + margin-bottom: 10px; +} + +#event-desc-text, #event-location-text, .event-form-location-end { + margin-top: 15px; } |