bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Roland Häder 2017-01-04 09:03:00 +01:00
commit 42c2e09382
8 changed files with 6435 additions and 6396 deletions
Download patch file Download diff file Expand all files Collapse all files

1
view/theme/frio/css/style.css
View file

@ -270,6 +270,7 @@ a#item-delete-selected {
vertical-align: baseline;
background-color: $link_color;
border-radius: 4px;
z-index: 1;
}
aside .badge {
opacity: 0.7;

9
view/theme/frio/templates/poke_content.tpl
View file

@ -6,10 +6,9 @@
<form id="poke-form" action="poke" method="get">
<div poke-content-wrapper
<div id="poke-content-wrapper">
{{* The input field with the recipient name*}}
<div id="poke-recip-wrapper" class="form-group">
<label for="poke-recip">{{$clabel}}</label>
<input id="poke-recip" class="form-control" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" name="pokename" autocomplete="off" />
@ -17,6 +16,7 @@
<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
</div>
{{* The drop-down list with different actions *}}
<div id="poke-action-wrapper" class="form-group">
<label for="poke-verb-select">{{$choice}}</label>
<select name="verb" id="poke-verb-select" class="form-control">
@ -26,6 +26,7 @@
</select>
</div>
{{* The checkbox to select if the "poke message" should be private *}}
<div id="poke-private-desc" class="checkbox">
<input type="checkbox" id=poke-private-desc-checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
<label for="poke-private-desc-checkbox">{{$prv_desc}}</label>
@ -41,7 +42,7 @@
<div id="poke-submit-wrapper-end"></div>
</form>
<div id="poke-wrapper-end"></div>
</div>