1
0
Fork 0

Merge pull request #938 from annando/master

API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
This commit is contained in:
fabrixxm 2014-04-22 16:15:42 +02:00
commit 22c45b9bf1
15 changed files with 147 additions and 434 deletions

View file

@ -1244,9 +1244,13 @@ position: relative;
overflow: hidden;
border-left: 0px;
padding-left: 0px;
font-size: 13px;
line-height: normal;
}
.type-link .oembed, .type-video .oembed {
font-size: inherit;
font-size: 18px;
font-weight: 300;
line-height: normal;
}
.type-link img, .type-video img {
/* position: absolute;
@ -1259,6 +1263,10 @@ top: 0; */
display: none;
}
h2 {
line-height: normal;
}
.wall-item-container .wall-item-content {
/* font-size: 14px; */
max-width: 660px;
@ -1339,7 +1347,7 @@ top: 0; */
transition: all 0.2s ease-in-out;
}
/* .wall-item-container .wall-item-content a, */
.wall-item-container .wall-item-content a,
.toplevel_item .fakelink,
.wall-item-container .fakelink {
color: black;
@ -2024,7 +2032,7 @@ ul.tabs a:hover, #event-notice:hover, #birthday-notice:hover, ul.tabs li .active
width: 200px;
}
.field input, .field textarea {
width: 400px;
max-width: 400px;
}
.field textarea {
height: 100px;
@ -2069,6 +2077,12 @@ ul.tabs a:hover, #event-notice:hover, #birthday-notice:hover, ul.tabs li .active
.field.radio .field_help {
margin-left: 0px;
}
aside form {
overflow-x: hidden;
}
aside form .field label {
float: inherit;
}
#profile-edit-links-end {
clear: both;

View file

@ -39,9 +39,9 @@
<span class="city-state-zip">
<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
<span class="region">{{$profile.region}}</span>
<span class="postal-code">{{$profile.postal-code}}</span>
<span class="postal-code">{{$profile.postal_code}}</span>
</span>
{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
</dd>
</dl>
{{/if}}