Merge branch 'master' into tres
Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
This commit is contained in:
@@ -8,23 +8,33 @@
|
||||
float: left;
|
||||
}
|
||||
|
||||
#event-summary, #start_text, #finish_text {
|
||||
width: 300px;
|
||||
#event-summary, #start_text {
|
||||
width: 95%;
|
||||
float: left;
|
||||
}
|
||||
|
||||
#finish_text {
|
||||
width: 100%;
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
||||
#event-category-wrap {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
.event-cats {
|
||||
margin-top: 15px;
|
||||
width: 400px;
|
||||
}
|
||||
|
||||
.bootstrap-tagsinput {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
.required {
|
||||
float: left;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
#event-datetime-break {
|
||||
@@ -39,3 +49,7 @@
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
#event-edit-preview-btn {
|
||||
margin-right: 15px;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user