aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-07-09 14:44:24 +0200
committerMario Vavti <mario@mariovavti.com>2015-07-09 14:44:24 +0200
commit115c18353ec73c924be7ceadf8ba2a1fd24f05e3 (patch)
treed40533a74e6e9aff97ae009524b533563ad5a728
parent59cddef032e3216d82694da6bab3eb3e8ae48203 (diff)
downloadvolse-hubzilla-115c18353ec73c924be7ceadf8ba2a1fd24f05e3.tar.gz
volse-hubzilla-115c18353ec73c924be7ceadf8ba2a1fd24f05e3.tar.bz2
volse-hubzilla-115c18353ec73c924be7ceadf8ba2a1fd24f05e3.zip
move profile image up and refine the aside width
-rw-r--r--view/css/widgets.css2
-rw-r--r--view/theme/redbasic/css/style.css11
-rw-r--r--view/theme/redbasic/js/redbasic.js2
-rw-r--r--view/theme/redbasic/php/style.php2
-rwxr-xr-xview/tpl/profile_vcard.tpl3
-rwxr-xr-xview/tpl/xchan_vcard.tpl2
6 files changed, 11 insertions, 11 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 0cfe98362..5b6e8aeb9 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -39,7 +39,7 @@
padding: 5px;
width: 100%;
resize: vertical;
- height: 245px;
+ height: 250px;
}
/* saved searches */
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 449c3a22a..1bfd11f6c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -412,7 +412,8 @@ footer {
}
#profile-photo-wrapper {
- margin-top: 10px;
+ margin-top: -10px;
+ margin-bottom: 10px;
}
@@ -704,8 +705,8 @@ a.rateme, div.rateme {
.contact-block-div {
float: left;
- width: 49px;
- height: 49px;
+ width: 50px;
+ height: 50px;
}
.contact-block-textdiv {
float: left;
@@ -720,8 +721,8 @@ a.rateme, div.rateme {
float: left;
}
.contact-block-img {
- width:47px;
- height:47px;
+ width:48px;
+ height:48px;
}
#tag-remove {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 9408f5a6c..ef3fa455c 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -7,7 +7,7 @@ $(document).ready(function() {
if( $('#css3-calc').width() == 10) {
$(window).resize(function() {
if($(window).width() < 767) {
- $('main').css('width', $(window).width() + 279 );
+ $('main').css('width', $(window).width() + 284 );
} else {
$('main').css('width', '100%' );
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 64ddcce7e..8dc349994 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
- $aside_width = 279;
+ $aside_width = 284;
// left aside and right aside are is 231px + converse width
if($converse_center) {
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 2964d9c4b..9eac48c6d 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,5 @@
<div class="vcard">
-
+ <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{if $profile.edit}}
<div class="dropdown">
<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
@@ -18,7 +18,6 @@
<div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</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>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index ca0fe76be..2acbb24e4 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,6 +1,6 @@
<div class="vcard">
-<div class="fn">{{$name}}</div>
<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+<div class="fn">{{$name}}</div>
</div>