aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-09-01 12:37:30 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-09-01 12:37:30 +0200
commit058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d (patch)
tree202f678d70f7a1e5063d5d2477f3a4900148a216 /view
parent8b615133d528eb074a23746afef6201f474a4e3f (diff)
downloadvolse-hubzilla-058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d.tar.gz
volse-hubzilla-058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d.tar.bz2
volse-hubzilla-058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d.zip
Fix profile vcard and style
Diffstat (limited to 'view')
-rw-r--r--view/profile_vcard.tpl31
-rw-r--r--view/theme/quattro/colors.less3
-rw-r--r--view/theme/quattro/quattro.less30
-rw-r--r--view/theme/quattro/style.css46
4 files changed, 95 insertions, 15 deletions
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 01238ed5a..88111b0f1 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -4,17 +4,11 @@
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
- <div id="profile-extra-links">
- <ul>
- {{ if $connect }}
- <li><a id="dfrn-request-link" href="dfrn_request/$profile['nickname']">$connect</a></li>
- {{ endif }}
- </ul>
- </div>
+
{{ if $location }}
- <div class="location"><span class="location-label">$location</span>
- <div class="adr">
+ <dl class="location"><dt class="location-label">$location</dt>
+ <dd class="adr">
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
<span class="city-state-zip">
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
@@ -22,20 +16,27 @@
<span class="postal-code">$profile.postal-code</span>
</span>
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
- </div>
-
+ </dd>
+ </dl>
{{ endif }}
- {{ if $gender }}<div class="mf"><span class="gender-label">$gender</span> <span class="x-gender">$profile.gender</span></div>{{ endif }}
+ {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
- {{ if $marital }}<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span>$marital</span><span class="marital-text">$profile.marital</span></div>{{ endif }}
+ {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
- {{ if $homepage }}<div class="homepage"><span class="homepage-label">$homepage</span><span class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></span></div>{{ endif }}
+ {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
+
+ <div id="profile-extra-links">
+ <ul>
+ {{ if $connect }}
+ <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+ {{ endif }}
+ </ul>
+ </div>
</div>
$contact_block
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index d79dbca68..6015c61ee 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -55,6 +55,9 @@
@MenuItemDetail: @Metalic2;
@AsideBorder: @Metalic1;
+@AsideConnect: @Grey1;
+@AsideConnectBg: @Blue3;
+@AsideConnectHoverBg: @Blue1;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index f83cce3ce..d21c3c182 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -203,8 +203,38 @@ aside {
width: 200px;
padding:0px 10px 0px 20px;
border-right: 1px solid @AsideBorder;
+
+ .vcard {
+ .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
+ .title { margin-bottom: 5px; }
+ dl { height: auto; overflow: auto; }
+ dt {float: left; margin-left: 0px; width: 35%; }
+ dd {float: left; margin-left: 4px; width: 60%;}
+
+ }
+
+ #profile-extra-links {
+ ul { padding: 0px; margin: 0px; }
+ li { padding: 0px; margin: 0px; list-style: none; }
+ }
+
+ #dfrn-request-link {
+ display: block;
+ .rounded();
+ color: @AsideConnect;
+ background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform:uppercase;
+ padding: 4px 2px 2px 35px;
+
+ &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
+ }
+
}
+
+
+
/* section */
section {
display: table-cell;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index e0d22a007..28e6f5fa1 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -250,6 +250,52 @@ aside {
padding: 0px 10px 0px 20px;
border-right: 1px solid #bdcdd4;
}
+aside .vcard .fn {
+ font-size: 16px;
+ font-weight: bold;
+ margin-bottom: 5px;
+}
+aside .vcard .title {
+ margin-bottom: 5px;
+}
+aside .vcard dl {
+ height: auto;
+ overflow: auto;
+}
+aside .vcard dt {
+ float: left;
+ margin-left: 0px;
+ width: 35%;
+}
+aside .vcard dd {
+ float: left;
+ margin-left: 4px;
+ width: 60%;
+}
+aside #profile-extra-links ul {
+ padding: 0px;
+ margin: 0px;
+}
+aside #profile-extra-links li {
+ padding: 0px;
+ margin: 0px;
+ list-style: none;
+}
+aside #dfrn-request-link {
+ display: block;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ color: #ffffff;
+ background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform: uppercase;
+ padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+ text-decoration: none;
+ background-color: #19aeff;
+}
/* section */
section {
display: table-cell;