Merge branch 'pull'

This commit is contained in:
friendica 2012-03-11 17:09:07 -07:00
commit 1401f763ec
2 changed files with 29 additions and 7 deletions

View file

@ -80,7 +80,7 @@ mark {
/* Redeclare monospace font family: h5bp.com/j */
pre, code, kbd, samp, .wall-item-body code {
font-family: monospace, monospace;
_font-family: 'courier new', monospace;
_font-family: monospace;
font-size: 1em; }
/* Improve readability of pre-formatted text in all browsers */
@ -667,8 +667,10 @@ aside #viewcontacts {
text-align: right;
}
.aprofile dt {
box-shadow: 1px 1px 5px 0;
color: #666666;
background: #eec;
color: #2e2f2e;
font-weight: bold;
box-shadow: 1px 1px 5px 0 #000;
margin: 15px 0 5px;
padding-left: 5px;
}
@ -928,11 +930,16 @@ aside #viewcontacts {
display: none;
}
#jot-preview-content {
background-color: #ffffe0;
border: 1px #aaaa00 solid;
background-color: #3e3f3e;
color: #eec;
border: 1px #eec solid;
border-radius: 3px;
padding: 3px 3px 6px 10px;
}
#jot-preview-content .wall-item-outside-wrapper {
border: 0;
border-radius: 0px;
}
/**
@ -1284,6 +1291,7 @@ section {
border-style: solid;
border-width: 1px 1px 1px 10px;
background: #eee;
color: #2e2f2e;
width: 95%;
}
@ -1653,8 +1661,9 @@ div[id$="wrapper"] br {
}
.contact-photo-menu {
width: auto;
border: 2px solid #444444;
background: #FFFFFF;
border: 2px solid #444;
background: #2e2f2e;
color: #eec;
position: absolute;
left: 0px; top: 90px;
display: none;
@ -2629,3 +2638,9 @@ footer {
display: inline-block;
}
@media handheld {
body {
font-size: 15pt;
}
}

View file

@ -2643,3 +2643,10 @@ footer {
display: inline-block;
}
@media handheld {
body {
font-size: 15pt;
}
}