harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some conv-item restructuring to allow full width elements

Browse Source
This commit is contained in:
Mario Vavti 2015-10-11 22:32:06 +02:00
parent 22a5a91bd5
commit c963aa98e8
5 changed files with 71 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
view/css/conversation.css
View File

@ -83,15 +83,6 @@ code {
margin-right: 10px; margin-right: 10px;
} }
.wall-item-photo-wrapper {
margin-top: 0px;
margin-bottom: 20px;
}
.comment .wall-item-photo-wrapper {
margin-bottom: 15px;
}
.wall-item-wrapper { .wall-item-wrapper {
margin-left:10px; margin-left:10px;
} }
@ -171,11 +162,6 @@ a.wall-item-name-link {
margin-top: 10px; margin-top: 10px;
} }
.wall-item-tools {
width: 100%;
margin-top: 10px;
}
.item-tool { .item-tool {
cursor: pointer; cursor: pointer;
} }

35
view/theme/redbasic/css/style.css
View File

@ -129,7 +129,7 @@ pre code {
code { code {
font-size: 1em; font-size: 1em;
padding: 5px; padding: 1em;
border: 1px solid #ccc; border: 1px solid #ccc;
background: #ccc; background: #ccc;
color: #000; color: #000;
@ -1432,7 +1432,10 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
.profile-match-connect { margin-top: 5px; } .profile-match-connect { margin-top: 5px; }
.reshared-content { margin-left: 20px; } .reshared-content { margin-left: 20px; }
.shared_header img { margin-right: 10px; } .shared_header img {
border-radius: $radiuspx;
margin-right: 10px;
}
.tag1 { .tag1 {
font-size : 0.9em !important; font-size : 0.9em !important;
@ -1635,39 +1638,39 @@ img.mail-conv-sender-photo {
/* conversation */ /* conversation */
.wall-item-head {
padding: 10px 10px 0px 10px;
}
.wall-item-content {
padding: 1em 10px;
}
.wall-item-tools {
padding: 0px 10px 10px 10px;
}
.wall-item-title { .wall-item-title {
font-size: $font_size; font-size: $font_size;
} }
.hide-comments-outer,
.thread-wrapper .wall-item-comment-wrapper,
.wall-item-content-wrapper.comment {
margin-left: $comment_indent;
}
.wall-item-content-wrapper { .wall-item-content-wrapper {
background-color: $item_colour; background-color: $item_colour;
padding: 10px;
border-top-right-radius: $radiuspx; border-top-right-radius: $radiuspx;
border-top-left-radius: $radiuspx; border-top-left-radius: $radiuspx;
} }
.wall-item-content-wrapper.comment { .wall-item-content-wrapper.comment {
background-color: $comment_item_colour; background-color: $comment_item_colour;
border-color: $comment_border_colour;
border-style: solid;
border-width: 0px 0px 0px 3px;
border-radius: 0px;
padding: 7px 10px 7px 7px;
} }
.hide-comments-outer { .hide-comments-outer {
background-color: $comment_item_colour; background-color: $comment_item_colour;
border-color: $comment_border_colour;
border-top-color: #ccc; border-top-color: #ccc;
border-style: solid; border-style: solid;
border-top-style: dashed; border-top-style: dashed;
border-width: 1px 0px 0px 3px; border-width: 1px 0px 0px 0px;
text-align: center; text-align: center;
border-radius: 0px; border-radius: 0px;
} }

4
view/theme/redbasic/tpl/theme_settings.tpl
View File

@ -16,8 +16,8 @@
{{include file="field_colorinput.tpl" field=$background_image}} {{include file="field_colorinput.tpl" field=$background_image}}
{{include file="field_colorinput.tpl" field=$item_colour}} {{include file="field_colorinput.tpl" field=$item_colour}}
{{include file="field_colorinput.tpl" field=$comment_item_colour}} {{include file="field_colorinput.tpl" field=$comment_item_colour}}
{{include file="field_colorinput.tpl" field=$comment_border_colour}} {{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
{{include file="field_input.tpl" field=$comment_indent}} {{*include file="field_input.tpl" field=$comment_indent*}}
{{include file="field_input.tpl" field=$body_font_size}} {{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}} {{include file="field_input.tpl" field=$font_size}}
{{include file="field_colorinput.tpl" field=$font_colour}} {{include file="field_colorinput.tpl" field=$font_colour}}

46
view/tpl/conv_item.tpl
View File

@ -8,30 +8,32 @@
<a name="{{$item.id}}" ></a> <a name="{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-head">
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
</div>
<div class="wall-item-photo-end" style="clear:both"></div>
</div> </div>
<div class="wall-item-photo-end" style="clear:both"></div> {{if $item.title}}
</div> <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
{{if $item.title}} <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
<div class="wall-item-title" id="wall-item-title-{{$item.id}}"> </div>
<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> {{/if}}
</div> {{if $item.lock}}
{{/if}} <div class="wall-item-lock dropdown">
{{if $item.lock}} <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
<div class="wall-item-lock dropdown"> </div>
<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp; {{/if}}
</div> <div class="wall-item-author">
{{/if}} <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
<div class="wall-item-author"> </div>
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}} <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
</div> {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> </div>
{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} <div class="clear"></div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-content" id="wall-item-content-{{$item.id}}">
<div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-{{$item.id}}" > <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
{{$item.body}} {{$item.body}}
{{if $item.tags}} {{if $item.tags}}
@ -52,6 +54,7 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
<div class="clear"></div>
</div> </div>
<div class="wall-item-tools"> <div class="wall-item-tools">
<div class="wall-item-tools-right btn-group pull-right"> <div class="wall-item-tools-right btn-group pull-right">
@ -167,6 +170,7 @@
{{/foreach}} {{/foreach}}
</div> </div>
{{/if}} {{/if}}
<div class="clear"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

46
view/tpl/conv_list.tpl
View File

@ -8,30 +8,32 @@
<a name="{{$item.id}}" ></a> <a name="{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-head">
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
</div>
<div class="wall-item-photo-end" style="clear:both"></div>
</div> </div>
<div class="wall-item-photo-end" style="clear:both"></div> {{if $item.title}}
</div> <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
{{if $item.title}} <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
<div class="wall-item-title" id="wall-item-title-{{$item.id}}"> </div>
<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> {{/if}}
</div> {{if $item.lock}}
{{/if}} <div class="wall-item-lock dropdown">
{{if $item.lock}} <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
<div class="wall-item-lock dropdown"> </div>
<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp; {{/if}}
</div> <div class="wall-item-author">
{{/if}} <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
<div class="wall-item-author"> </div>
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}} <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
</div> {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> </div>
{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} <div class="clear"></div>
</div> </div>
<div class="wall-item-content conv-list-mode" id="wall-item-content-{{$item.id}}"> <div class="wall-item-content conv-list-mode" id="wall-item-content-{{$item.id}}">
<div class="wall-item-title-end"></div>
<div class="wall-item-body wall-item-listbody" id="wall-item-body-{{$item.id}}" > <div class="wall-item-body wall-item-listbody" id="wall-item-body-{{$item.id}}" >
{{$item.body}} {{$item.body}}
{{if $item.tags}} {{if $item.tags}}
@ -52,6 +54,7 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
<div class="clear"></div>
</div> </div>
<div class="wall-item-tools"> <div class="wall-item-tools">
<div class="wall-item-tools-right btn-group pull-right"> <div class="wall-item-tools-right btn-group pull-right">
@ -176,6 +179,7 @@
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
</div> </div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>