Merge branch 'master' of git://github.com/friendika/friendika
This commit is contained in:
commit
d08b068031
45 changed files with 362 additions and 133 deletions
|
@ -3,5 +3,7 @@
|
|||
<a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
|
||||
<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
|
||||
<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
|
||||
$events
|
||||
$notes
|
||||
<div id="profile-tabs-end"></div>
|
||||
</div>
|
|
@ -2224,7 +2224,8 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.eventcal {
|
||||
font-size: 24px;
|
||||
float: left;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
#new-event-link {
|
||||
|
@ -2245,6 +2246,17 @@ a.mail-list-link {
|
|||
.event-start .dtstart, .event-end .dtend {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.prevcal, .nextcal {
|
||||
float: left;
|
||||
margin-left: 32px;
|
||||
margin-right: 32px;
|
||||
margin-top: 64px;
|
||||
}
|
||||
.event-calendar-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
|
||||
.calendar {
|
||||
font-family: Courier, monospace;
|
||||
|
@ -2454,6 +2466,8 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#lang-select-icon {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
|
@ -2505,6 +2519,8 @@ a.mail-list-link {
|
|||
.youtube { background-position: -64px -32px;}
|
||||
.attach { background-position: -80px -32px; }
|
||||
.language { background-position: -96px -32px; }
|
||||
.prev { background-position: -112px -32px; }
|
||||
.next { background-position: -128px -32px; }
|
||||
|
||||
|
||||
.attachtype {
|
||||
|
|
|
@ -2423,6 +2423,48 @@ a.mail-list-link {
|
|||
color: #FF0000;
|
||||
}
|
||||
|
||||
.eventcal {
|
||||
float: left;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
#new-event-link {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.event-description:before {
|
||||
content: url('../../../images/calendar.png');
|
||||
margin-right: 15px;
|
||||
}
|
||||
|
||||
.event-start, .event-end {
|
||||
margin-left: 10px;
|
||||
width: 330px;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.event-start .dtstart, .event-end .dtend {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.prevcal, .nextcal {
|
||||
float: left;
|
||||
margin-left: 32px;
|
||||
margin-right: 32px;
|
||||
margin-top: 64px;
|
||||
}
|
||||
.event-calendar-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.calendar {
|
||||
font-family: Courier, monospace;
|
||||
}
|
||||
.today {
|
||||
color: #FF0000;
|
||||
}
|
||||
|
||||
|
||||
#event-start-text, #event-finish-text {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 5px;
|
||||
|
@ -2491,6 +2533,8 @@ a.mail-list-link {
|
|||
.youtube { background-position: -64px -32px;}
|
||||
.attach { background-position: -80px -32px; }
|
||||
.language { background-position: -96px -32px; }
|
||||
.prev { background-position: -112px -32px; }
|
||||
.next { background-position: -128px -32px; }
|
||||
|
||||
.attachtype {
|
||||
display: block; width: 20px; height: 23px;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue