friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Vier: Adding some shadows. In the thread view showing the application when hovering over the network name (less information is sometimes more)

This commit is contained in:
Michael Vogel 2014-02-02 09:57:31 +01:00
parent 4d574866b1
commit 6c46c8333d
3 changed files with 86 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
object/Item.php
View File

@ -299,6 +299,8 @@ class Item extends BaseObject {
'title' => $title_e, 'title' => $title_e,
'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
'app' => $item['app'],
'created' => relative_date($item['created']),
'lock' => $lock, 'lock' => $lock,
'location' => $location_e, 'location' => $location_e,
'indent' => $indent, 'indent' => $indent,

115
view/theme/vier/style.css
View File

@ -289,11 +289,15 @@ blockquote.shared_content {
/* global */ /* global */
body { body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; /* font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; */
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
/* font-size: 13px; */
/* line-height: 19.5px; */
font-weight: 400;
/* background-color: #ffffff; */ /* background-color: #ffffff; */
background-color: #FAFAFA; /* background-color: #FAFAFA; */
/* background-color: rgb(252, 252, 252); */ background-color: rgb(229, 229, 229);
color: #2d2d2d; color: #2d2d2d;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
display: table; display: table;
@ -550,8 +554,8 @@ nav {
z-index: 100; z-index: 100;
/*-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); /*-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
border-bottom: 5px solid #F80; */ border-bottom: 5px solid #F80; */
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
} }
nav .icon { nav .icon {
@ -880,11 +884,12 @@ aside {
top: 32px; top: 32px;
overflow-y: auto; overflow-y: auto;
z-index: 2; z-index: 2;
line-height: 17px;
position: fixed; position: fixed;
/* overflow: auto; */ /* overflow: auto; */
height: calc(100% - 42px); height: calc(100% - 42px);
/* overflow: scroll; */ /* overflow: scroll; */
box-shadow: 1px 1px 6px -3px #666;
} }
aside .vcard .fn { aside .vcard .fn {
font-size: 18px; font-size: 18px;
@ -1091,13 +1096,15 @@ section {
padding: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;
/* background-color: white; */ /* background-color: white; */
/* background-color: rgb(252, 252, 252); */ /* background-color: rgb(252, 252, 252); */
background-color: #FAFAFA; /* background-color: #FAFAFA; */
border-bottom: 1px solid lightgray; background-color: inherit;
/* border-bottom: 1px solid lightgray;
border-right: 1px solid lightgray; border-right: 1px solid lightgray;
border-left: 1px solid lightgray; border-left: 1px solid lightgray; */
position: absolute; position: absolute;
left: 215px; /*left: 215px;*/
left: calc(215px + (100% - (215px + 766px)) / 6);
/* left: calc(215px + (100% - 215px) / 10); */
} }
section.minimal { section.minimal {
@ -1111,12 +1118,15 @@ section.minimal {
border-bottom: 1px solid #D2D2D2; border-bottom: 1px solid #D2D2D2;
position: relative; position: relative;
padding: 5px; padding: 5px;
margin-bottom: 0px; margin-bottom: 10px;
/* width: 755px; */ box-shadow: 1px 1px 6px -3px rgba(0, 0, 0, 0.7);
background-color: #FAFaFa;
/* width: 755px; */
} }
.wall-item-decor { .wall-item-decor {
position: absolute; position: absolute;
left: 755px; /* left: 755px; */
left: calc(100% - 7px);
/* top: -10px; */ /* top: -10px; */
width: 16px; width: 16px;
} }
@ -1125,7 +1135,8 @@ border-bottom: 1px solid #D2D2D2;
} }
.wall-item-container { .wall-item-container {
display: table; display: table;
width: 745px; /* width: 745px; */
width: calc(100% - 10px);
} }
.wall-item-content hr { .wall-item-content hr {
@ -1143,7 +1154,7 @@ border-bottom: 1px solid #D2D2D2;
display: table-row; display: table-row;
} }
.wall-item-bottom { .wall-item-bottom {
font-size: 14px; /* font-size: 14px; */
} }
.wall-item-container .wall-item-bottom { .wall-item-container .wall-item-bottom {
opacity: 0; opacity: 0;
@ -1208,20 +1219,22 @@ border-bottom: 1px solid #D2D2D2;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 14px; /* font-size: 14px; */
max-width: 660px; max-width: 660px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.36; /* line-height: 1.36; */
padding-bottom: 6px; padding-bottom: 6px;
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
max-width: 650px; max-width: 100%;
/* max-width: 650px; */
/* max-width: 580px; */ /* max-width: 580px; */
} }
.children .wall-item-container .wall-item-item .wall-item-content img { .children .wall-item-container .wall-item-item .wall-item-content img {
/* max-width: 650px; */ /* max-width: 650px; */
max-width: 580px; /* max-width: 580px; */
max-width: 100%;
} }
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell; display: table-cell;
@ -1338,7 +1351,8 @@ border-bottom: 1px solid #D2D2D2;
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 80px; margin-left: 80px;
width: 665px; /* width: 665px; */
width: calc(100% - 90px);
border-bottom: 1px solid hsl(198, 21%, 79%); border-bottom: 1px solid hsl(198, 21%, 79%);
} }
.wall-item-container.comment .wall-item-content { .wall-item-container.comment .wall-item-content {
@ -1371,13 +1385,13 @@ border-bottom: 1px solid #D2D2D2;
.wall-item-comment-wrapper textarea { .wall-item-comment-wrapper textarea {
height: 1.2em; height: 1.2em;
width: 100%; width: 100%;
font-size: 10px; font-size: 13px;
color: #999999; color: #999999;
border: 1px solid #DDD; border: 1px solid #DDD;
padding: 0.3em; padding: 0.3em;
} }
.wall-item-comment-wrapper .comment-edit-text-full { .wall-item-comment-wrapper .comment-edit-text-full {
font-size: 14px; /* font-size: 14px; */
height: 4em; height: 4em;
color: #2d2d2d; color: #2d2d2d;
border: 1px solid #2d2d2d; border: 1px solid #2d2d2d;
@ -1427,34 +1441,47 @@ border-bottom: 1px solid #D2D2D2;
} }
.twit { .twit {
background-color: #FFFAFA; /* background-color: #FFFAFA; */
background-color: #fafeff;
} }
.pump { .pump {
background-color: #FAFFFA; /* background-color: #FAFFFA; */
background-color: #fcfffa;
} }
.face { .face {
background-color: #FAFAFF; /* background-color: #FAFAFF; */
background-color: #fafcff;
} }
.feed { .feed {
background-color: #FFFFFA; /* background-color: #FFFFFA; */
background-color: #fffdfa;
} }
.dspr { .dspr {
background-color: #FFFAFF; background-color: #FFFAFF;
} }
.dfrn { .dfrn {
background-color: #FAFFFF;
}
.stat {
background-color: #FAFAFA; background-color: #FAFAFA;
} }
.stat {
/* background-color: #FAFFFF; */
background-color: #fffafd;
}
.mail { .mail {
background-color: #FFFFF9; /* background-color: #FFFFF9; */
background-color: #fffafa;
}
#profile-jot-form {
box-shadow: 1px 1px 6px -3px #666;
background-color: #fafafa;
padding: 10px;
} }
#profile-jot-form #profile-jot-text { #profile-jot-form #profile-jot-text {
height: 2.0em; height: 2.0em;
/* width: 99%; */ /* width: 99%; */
width: 752px; /* width: 752px; */
width: calc(100% - 10px);
font-size: 15px; font-size: 15px;
color: #999999; color: #999999;
border: 1px solid #DDD; border: 1px solid #DDD;
@ -1469,7 +1496,8 @@ border-bottom: 1px solid #D2D2D2;
height: 20px; height: 20px;
margin: 0 0 5px; margin: 0 0 5px;
/* width: 60%; */ /* width: 60%; */
width: 762px; /* width: 762px; */
width: 100%;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
@ -1480,7 +1508,8 @@ border-bottom: 1px solid #D2D2D2;
font-weight: normal; font-weight: normal;
} }
#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ #profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
width: 785px; /* width: 785px; */
width: 100%;
height: 100px; height: 100px;
} }
@ -1911,6 +1940,26 @@ ul.tabs a {
color: #444; color: #444;
} }
ul.tabs a {
box-shadow: 1px 1px 6px -3px #666;
margin-right: 5px;
}
#birthday-notice, #event-notice {
box-shadow: 1px 1px 6px -3px #666;
margin-bottom: 5px;
}
#birthday-wrapper, #event-wrapper {
background-color: #FAFAFA;
box-shadow: 1px 1px 6px -3px #666;
padding-left: 10px;
padding-right: 10px;
padding-top: 5px;
padding-bottom: 5px;
margin-bottom: 10px;
}
div.pager, .birthday-notice, #jot-preview-link, .comment-edit-submit-wrapper .fakelink { div.pager, .birthday-notice, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
padding: 2px 7px 2px 7px; padding: 2px 7px 2px 7px;
color: black; color: black;

4
view/theme/vier/templates/wall_thread.tpl
View File

@ -59,10 +59,10 @@
<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}} {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}}
<span class="wall-item-ago"> <span class="wall-item-ago">
{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}} {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.created}}</a>{{else}} {{$item.created}} {{/if}}
{{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}} {{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
</span> </span>
<span class="wall-item-network"> <span class="wall-item-network" title="{{$item.app}}">
{{$item.network_name}} {{$item.network_name}}
</span> </span>
</div> </div>