Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes

This commit is contained in:
Mikael Nordfeldth 2016-01-03 16:23:07 +01:00
commit aa3028e5d9
3 changed files with 35 additions and 20 deletions

View File

@ -1611,12 +1611,13 @@ ul.profile_list li {
margin-bottom: 20px; margin-bottom: 20px;
} }
ul.profiles.groups {
list-style-type:none;
}
.profile_list .h-card .u-photo { .profile_list .h-card .u-photo {
margin-right: 4px; margin-right: 4px;
} }
.profile_list .h-card .p-nickname {
display: block;
}
table.profile_list tbody tr:nth-child(2n+1) { table.profile_list tbody tr:nth-child(2n+1) {
background-color: #fafafa !important; background-color: #fafafa !important;
@ -1629,14 +1630,17 @@ margin-left:0;
} }
.entity_profile .p-nickname { .entity_profile .p-nickname {
font-size:1.4em; font-weight: bold;
} }
.entity_profile .p-name { .entity_profile .p-name {
font-size: 1.2em;
clear: left; clear: left;
} }
.entity_profile .label {
display: block;
}
.entity_profile .p-name:before { .entity_profile .p-name:before {
content: "("; content: "(";
font-weight:normal; font-weight:normal;
@ -1882,7 +1886,7 @@ left:3px;
} }
.profile .entity_profile { .profile .entity_profile {
margin-bottom:0; margin-bottom:10px;
min-height:60px; min-height:60px;
} }

View File

@ -1158,11 +1158,6 @@ td.entity_profile {
font-size: 1.4em; font-size: 1.4em;
} }
.profile_list .label {
display: block;
margin-left: 59px !important;
}
.profile_list .note { .profile_list .note {
font-size: 0.88em; font-size: 0.88em;
line-height: 1.36em; line-height: 1.36em;

View File

@ -585,24 +585,39 @@ ul.profile_list li {
margin-right: 10px; margin-right: 10px;
} }
.profile .entity_profile .p-name,
.profile .entity_profile .p-locality, /* these apply to both profiles and groups */
.profile .entity_profile .role, .entity_profile .p-name,
.profile .entity_profile > span, .entity_profile .p-locality,
.profile .entity_profile .u-url[rel~="contact"] { .entity_profile .role,
.entity_profile > span,
.entity_profile .u-url[rel~="contact"] {
display: inline; display: inline;
margin-left: 0; font-size:1.0em;
font-size:0.88em;
color:#9197a3; color:#9197a3;
} }
.entity_profile .p-name:before, .entity_profile .p-nickname {
color:#666 !important;
display: block !important;
}
.entity_profile .label {
display: inline !important;
}
.entity_profile .p-name:after { .entity_profile .p-name:after {
content: ""; content: "";
} }
.profile .entity_profile .u-url { .profile .entity_profile .u-url {
font-size:0.88em; font-size:1.0em;
}
/* clear parethesis from base theme */
.entity_profile .p-name:before,
.entity_profile .p-name:after {
content: "";
} }
.entity_profile .role:before { .entity_profile .role:before {
@ -613,6 +628,7 @@ ul.profile_list li {
content: ")"; content: ")";
} }
.entity_profile .label:before,
.profile .entity_profile .p-locality:before { .profile .entity_profile .p-locality:before {
content:" · "; content:" · ";
} }