Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 03:25:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2131 from rabuzarus/3011_hcard_vcard

Browse source 
unify hcard and vcard
This commit is contained in:
Michael Vogel 2015-12-03 14:16:52 +01:00
commit 1f9644bded
23 changed files with 238 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

11
view/theme/duepuntozero/style.css
View file

@ -2492,14 +2492,14 @@ aside input[type='text'] {
margin-bottom: 25px;
}
.location-label, .gender-label, .marital-label, .homepage-label {
.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
float: left;
text-align: right;
display: block;
width: 65px;
}
.adr, .x-gender, .marital-text, .homepage-url {
.adr, .x-gender, .marital-text, .homepage-url, .x-network {
float: left;
display: block;
margin-left: 8px;
@ -2538,11 +2538,16 @@ aside input[type='text'] {
}
.vcard .title,
.vcard .p-faddr {
.vcard .p-addr {
margin-bottom: 5px;
margin-left: 12px;
}
.vcard .account-type {
font-size: 120%;
margin-bottom: 13px;
}
.vcard dl {
clear: both;
}

6
view/theme/duepuntozero/templates/profile_vcard.tpl
View file

@ -3,12 +3,14 @@
<div class="fn label">{{$profile.name}}</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
{{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
{{if $location}}
<dl class="location"><dt class="location-label">{{$location}}</dt>

12
view/theme/frost-mobile/style.css
View file

@ -3081,14 +3081,14 @@ aside input[type='text'] {
margin-bottom: 25px;
}
.location-label, .gender-label, .marital-label, .homepage-label {
.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
float: left;
text-align: right;
display: block;
width: 65px;
}
.adr, .x-gender, .marital-text, .homepage-url {
.adr, .x-gender, .marital-text, .homepage-url, .x-network {
float: left;
display: block;
margin-left: 8px;
@ -3127,11 +3127,17 @@ aside input[type='text'] {
}
.vcard .title,
.vcard .p-faddr {
.vcard .p-addr,
.vcard .account-type {
margin-bottom: 5px;
margin-left: 12px;
}
.vcard .account-type {
font-size: 120%;
margin-bottom: 13px;
}
.vcard dl {
clear: both;
}

6
view/theme/frost-mobile/templates/profile_vcard.tpl
View file

@ -3,12 +3,14 @@
<div class="fn label">{{$profile.name}}</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
{{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
{{if $location}}
<dl class="location"><dt class="location-label">{{$location}}</dt>

11
view/theme/frost/style.css
View file

@ -2867,14 +2867,14 @@ aside input[type='text'] {
margin-bottom: 25px;
}
.location-label, .gender-label, .marital-label, .homepage-label {
.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
float: left;
text-align: right;
display: block;
width: 65px;
}
.adr, .x-gender, .marital-text, .homepage-url {
.adr, .x-gender, .marital-text, .homepage-url, .x-network {
float: left;
display: block;
margin-left: 8px;
@ -2913,10 +2913,15 @@ aside input[type='text'] {
}
.vcard .title,
.vcard .p-faddr {
.vcard .p-addr,
.vcard .account-type {
margin-bottom: 5px;
margin-left: 12px;
}
.vcard .account-type {
font-size: 120%;
margin-bottom: 13px;
}
.vcard dl {
clear: both;

6
view/theme/frost/templates/profile_vcard.tpl
View file

@ -3,12 +3,14 @@
<div class="fn label">{{$profile.name}}</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
{{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
{{if $location}}
<dl class="location"><dt class="location-label">{{$location}}</dt>

6
view/theme/quattro/dark/style.css
View file

@ -833,9 +833,13 @@ aside .vcard .fn {
aside .vcard .title {
margin-bottom: 5px;
}
aside .vcard .p-faddr {
aside .vcard .p-addr {
margin-bottom: 5px;
}
aside .vcard .account-type {
font-size: 14px;
margin-bottom: 13px;
}
aside .vcard dl {
height: auto;
overflow: auto;

6
view/theme/quattro/green/style.css
View file

@ -833,9 +833,13 @@ aside .vcard .fn {
aside .vcard .title {
margin-bottom: 5px;
}
aside .vcard .p-faddr {
aside .vcard .p-addr {
margin-bottom: 5px;
}
aside .vcard .account-type {
font-size: 14px;
margin-bottom: 13px;
}
aside .vcard dl {
height: auto;
overflow: auto;

6
view/theme/quattro/lilac/style.css
View file

@ -833,9 +833,13 @@ aside .vcard .fn {
aside .vcard .title {
margin-bottom: 5px;
}
aside .vcard .p-faddr {
aside .vcard .p-addr {
margin-bottom: 5px;
}
aside .vcard .account-type {
font-size: 14px;
margin-bottom: 13px;
}
aside .vcard dl {
height: auto;
overflow: auto;

3
view/theme/quattro/quattro.less
View file

@ -332,7 +332,8 @@ aside {
.vcard {
.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
.title { margin-bottom: 5px; }
.p-faddr{ margin-bottom: 5px; }
.p-addr { margin-bottom: 5px; }
.account-type { font-size: 14px; margin-bottom: 13px; }
dl { height: auto; overflow: auto; }
dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
dd {float: left; margin-left: 4px; width: 60%;}

4
view/theme/quattro/templates/profile_vcard.tpl
View file

@ -26,12 +26,14 @@
{{/if}}
</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
{{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
{{if $location}}
<dl class="location"><dt class="location-label">{{$location}}</dt>

10
view/theme/smoothly/style.css
View file

@ -665,6 +665,10 @@ aside h4 {
font-size: 1em;
}
.vcard .account-type {
font-size: 1.2em;
}
.vcard dd {
font-size: 12px;
font-variant: normal;
@ -4554,7 +4558,8 @@ hr.line-dots {
.location-label,
.gender-label,
.marital-label,
.homepage-label {
.homepage-label,
.network-label {
float: left;
text-align: left;
display: block;
@ -4564,7 +4569,8 @@ hr.line-dots {
.adr,
.x-gender,
.marital-text,
.homepage-url {
.homepage-url,
.x-network {
float: left;
display: block;
margin-left: 8px;

6
view/theme/vier/style.css
View file

@ -1000,11 +1000,17 @@ aside .vcard .fn {
}
aside .vcard .title {
margin-bottom: 5px;
float: left;
}
aside .vcard dl {
height: auto;
overflow: auto;
}
aside .vcard .account-type {
margin-bottom: 13px;
font-size: 14px;
font-weight: bold;
}
aside select {
background-color: white;

7
view/theme/vier/templates/profile_vcard.tpl
View file

@ -13,16 +13,17 @@
{{/if}}
</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $profile.picdate}}
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
{{else}}
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
{{/if}}
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
{{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
{{if $location}}
<dl class="location"><dt class="location-label">{{$location}}</dt>