harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tres

Browse Source 
Conflicts:
	mod/events.php
	view/css/mod_events.css
This commit is contained in:
friendica
2015-02-08 20:57:37 -08:00
parent 4b348d2489 247579ebf1
commit 08b757a22c
97 changed files with 9030 additions and 7689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
view/css/mod_events.css
View File

@@ -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;
}
#event-nofinish-break {
margin-bottom: 10px;
clear: both;
}
#event-nofinish-break {
margin-bottom: 10px;
}
#event-desc-text, #event-location-text, .event-form-location-end {
margin-top: 15px;
}