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

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-05-26 16:39:35 -07:00
commit d749c1d9c6
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/css/conversation.css
View File

@ -16,7 +16,7 @@
}
#profile-jot-text {
height: 3.4em;
height: 40px;
padding: 8px;
width: 100%;
}

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

@ -1847,11 +1847,11 @@ img.mail-list-sender-photo {
}
#profile-jot-text::-webkit-input-placeholder {
font-size:1.5em;
font-size:19px;
}
#profile-jot-text::-moz-placeholder {
font-size:1.5em;
font-size:19px;
}
#profile-jot-text:focus::-webkit-input-placeholder {
@ -1988,6 +1988,7 @@ img.mail-list-sender-photo {
.comment-edit-text-empty {
color: gray;
font-size: 11px;
}
.comment-edit-text-full {
@ -2266,7 +2267,7 @@ blockquote {
.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
background-color: $editbuttons_bghover;
border-color: $editbuttons_bordercolour;
border-color: $editbuttons_bordercolourhover;
color: $input_colourhover;
text-decoration: $input_decohover;
}
@ -2275,9 +2276,6 @@ blockquote {
text-decoration: none;
}
.btn-preview, .btn-preview:hover, .btn-preview:focus, .btn-preview:active {
margin-right: 1px;
}
@media screen and (max-width: 767px) {
aside#region_1 {

3
view/theme/redbasic/php/style.php
View File

@ -167,6 +167,8 @@ if(! $a->install) {
$editbuttons_bgcolour = "transparent";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#ccc";
if (! $editbuttons_bordercolourhover)
$editbuttons_bordercolourhover = "#adadad";
if (! $editbuttons_colour)
$editbuttons_colour = "#333";
if (! $editbuttons_bghover)
@ -322,6 +324,7 @@ $options = array (
'$notif_itemhovercolour' => $notif_itemhovercolour,
'$editbuttons_bgcolour' => $editbuttons_bgcolour,
'$editbuttons_bordercolour' => $editbuttons_bordercolour,
'$editbuttons_bordercolourhover' => $editbuttons_bordercolourhover,
'$editbuttons_colour' => $editbuttons_colour,
'$editbuttons_bghover' => $editbuttons_bghover,
'$dropdown_bgcolour' => $dropdown_bgcolour,

2
view/tpl/comment_item.tpl
View File

@ -54,7 +54,7 @@
</div>
<div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}">
{{if $preview}}
<button id="comment-edit-submit-{{$id}}" class="btn btn-default btn-xs btn-preview" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
<button id="comment-edit-submit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
<i class="icon-eye-open comment-icon" ></i>
</button>
{{/if}}

2
view/tpl/conv_item.tpl
View File

@ -26,7 +26,7 @@
<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>
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></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.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></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>&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
</div>
<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
<div class="wall-item-title-end"></div>

2
view/tpl/jot.tpl
View File

@ -81,7 +81,7 @@
</button>
{{/if}}
{{if $preview}}
<button class="btn btn-default btn-sm btn-preview" onclick="preview_post();return false;" title="{{$preview}}">
<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
<i class="icon-eye-open jot-icons" ></i>
</button>
{{/if}}