Merge branch 'master' of git://github.com/friendika/friendika
This commit is contained in:
commit
dbf6ee6a05
9 changed files with 215 additions and 49 deletions
|
@ -6,6 +6,10 @@ $e_desc
|
|||
|
||||
<form action="$post" method="post" >
|
||||
|
||||
<input type="hidden" name="event_id" value="$eid" />
|
||||
<input type="hidden" name="cid" value="$cid" />
|
||||
<input type="hidden" name="uri" value="$uri" />
|
||||
|
||||
<div id="event-start-text">$s_text</div>
|
||||
$s_dsel $s_tsel
|
||||
|
||||
|
|
|
@ -2228,10 +2228,29 @@ a.mail-list-link {
|
|||
font-size: 20px;
|
||||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.vevent .event-start {
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
#new-event-link {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.edit-event-link, .plink-event-link {
|
||||
float: left;
|
||||
margin-top: 4px;
|
||||
margin-right: 4px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.event-description:before {
|
||||
content: url('../../../images/calendar.png');
|
||||
margin-right: 15px;
|
||||
|
@ -2247,6 +2266,10 @@ a.mail-list-link {
|
|||
float: right;
|
||||
}
|
||||
|
||||
.event-list-date {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.prevcal, .nextcal {
|
||||
float: left;
|
||||
margin-left: 32px;
|
||||
|
@ -2262,6 +2285,7 @@ a.mail-list-link {
|
|||
font-family: Courier, monospace;
|
||||
}
|
||||
.today {
|
||||
font-weight: bold;
|
||||
color: #FF0000;
|
||||
}
|
||||
|
||||
|
|
|
@ -2428,15 +2428,42 @@ a.mail-list-link {
|
|||
font-size: 20px;
|
||||
}
|
||||
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.vevent .event-start {
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
|
||||
#new-event-link {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
|
||||
.edit-event-link, .plink-event-link {
|
||||
float: left;
|
||||
margin-top: 4px;
|
||||
margin-right: 4px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
|
||||
.event-description:before {
|
||||
content: url('../../../images/calendar.png');
|
||||
margin-right: 15px;
|
||||
}
|
||||
|
||||
.event-list-date {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.event-start, .event-end {
|
||||
margin-left: 10px;
|
||||
width: 330px;
|
||||
|
@ -2461,6 +2488,7 @@ a.mail-list-link {
|
|||
font-family: Courier, monospace;
|
||||
}
|
||||
.today {
|
||||
font-weight: bold;
|
||||
color: #FF0000;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue