1
0
Fork 0

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2012-11-17 14:29:09 +01:00
commit c0376339e0
10 changed files with 980 additions and 15398 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1211,7 +1211,11 @@ body .pageheader{
}
#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
margin-bottom: 10px;
background-color: lightblue;
border: think solid black;
margin: 2px;
padding: 5px;
width: 95%;
}
right_aside {

View file

@ -1186,7 +1186,11 @@ body .pageheader{
}
#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
margin-bottom: 10px;
background-color: lightblue;
border: think solid black;
margin: 2px;
padding: 5px;
width: 95%;
}
right_aside {