keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Michael 2017-02-10 19:18:03 +00:00
commit 95bb8d38e8
9 changed files with 94 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
view/global.css
View file

@ -117,6 +117,10 @@ span.connector {
position: relative; position: relative;
} }
.embed_video.active {
float: none;
}
.embed_rich { .embed_rich {
display: block; display: block;
transition: height .75s; transition: height .75s;

2
view/templates/oembed_video.tpl
View file

@ -1,4 +1,4 @@
<a class="embed_video" href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;'> <a class="embed_video" href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); this.classList.add("active"); return false;'>
<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' > <img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
<div style='width: {{$tw}}px; height: {{$th}}px;'></div> <div style='width: {{$tw}}px; height: {{$th}}px;'></div>
</a> </a>

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

@ -1719,13 +1719,14 @@ img.acpopup-img {
} }
/* Menubar Tabs */ /* Menubar Tabs */
section > ul.tabbar { section > .tabbar-wrapper {
/* The tabbar shouldn't' be visibile inside /* The tabbar shouldn't' be visibile inside
the section element. Only after we have the section element. Only after we have
moved it to the nav through js */ moved it to the nav through js */
display: none !important; display: none !important;
} }
#tabmenu, #tabmenu,
.tabbar-wrapper,
.tabbar, .tabbar,
.tabbar > li { .tabbar > li {
height: 100%; height: 100%;

58
view/theme/frio/js/theme.js
View file

@ -40,7 +40,7 @@ $(document).ready(function(){
$(".field.select > select, .field.custom > select").addClass("form-control"); $(".field.select > select, .field.custom > select").addClass("form-control");
// move the tabbar to the second nav bar // move the tabbar to the second nav bar
$("section ul.tabbar").first().appendTo("#topbar-second > .container > #tabmenu"); $("section .tabbar-wrapper").first().appendTo("#topbar-second > .container > #tabmenu");
// add mask css url to the logo-img container // add mask css url to the logo-img container
// //
@ -256,40 +256,30 @@ $(document).ready(function(){
input.val(val); input.val(val);
}); });
// Set the padding for input elements with inline buttons
//
// In Frio we use some input elements where the submit button is visually
// inside the the input field (through css). We need to set a padding-right
// to the input element where the padding value would be at least the width
// of the button. Otherwise long user input would be invisible because it is
// behind the button.
$("body").on('click', '.form-group-search > input', function() {
// Get the width of the button (if the button isn't available
// buttonWidth will be null
var buttonWidth = $(this).next('.form-button-search').outerWidth();
if (buttonWidth) {
// Take the width of the button and ad 5px
var newWidth = buttonWidth + 5;
// Set the padding of the input element according
// to the width of the button
$(this).css('padding-right', newWidth);
}
});
}); });
//function commentOpenUI(obj, id) {
// $(document).unbind( "click.commentOpen", handler );
//
// var handler = function() {
// if(obj.value == '{{$comment}}') {
// obj.value = '';
// $("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
// // Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
// // The submit button gets tabindex + 1
// $("#comment-edit-text-" + id).attr('tabindex','9');
// $("#comment-edit-submit-" + id).attr('tabindex','10');
// $("#comment-edit-submit-wrapper-" + id).show();
// }
// };
//
// $(document).bind( "click.commentOpen", handler );
//}
//
//function commentCloseUI(obj, id) {
// $(document).unbind( "click.commentClose", handler );
//
// var handler = function() {
// if(obj.value === '') {
// obj.value = '{{$comment}}';
// $("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty");
// $("#comment-edit-text-" + id).removeAttr('tabindex');
// $("#comment-edit-submit-" + id).removeAttr('tabindex');
// $("#comment-edit-submit-wrapper-" + id).hide();
// }
// };
//
// $(document).bind( "click.commentClose", handler );
//}
function openClose(theID) { function openClose(theID) {
var elem = document.getElementById(theID); var elem = document.getElementById(theID);

104
view/theme/frio/templates/common_tabs.tpl
View file

@ -1,58 +1,60 @@
{{* Tab navigation bar for tablets and computer *}} <div class="tabbar-wrapper">
<ul role="menubar" class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs"> {{* Tab navigation bar for tablets and computer *}}
{{* The normal tabbar *}} <ul role="menubar" class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
<li> {{* The normal tabbar *}}
<ul class="tabs flex-nav" role="menu" > <li>
{{foreach $tabs as $tab}} <ul class="tabs flex-nav" role="menu" >
<li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
{{/foreach}}
</ul>
</li>
{{* The extended dropdown menu - this would be shown if the tab menu points
dosn't fit in the available space. This is done through flexMenu.js *}}
<li class="pull-right">
<ul class="tabs tabs-extended" role="menu">
<li role="menuitem" class="dropdown flex-target">
<a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
<i class="fa fa-chevron-down"></i>
</a>
</li>
</ul>
</li>
</ul>
{{* Tab navigation bar for smartphones *}}
<ul role="menubar" class="tabbar list-inline visible-xs">
{{* The active menupoint will be shown as one menupoint*}}
<li>
<ul class="tabs" role="menu">
{{foreach $tabs as $tab}} {{foreach $tabs as $tab}}
{{if $tab.sel}}
<li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li> <li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
{{else}}
{{$exttabs[]=$tab}}
{{/if}}
{{/foreach}} {{/foreach}}
</ul>
</li>
{{* The extended dropdown menu - this would be shown if the tab menu points
</ul> dosn't fit in the available space. This is done through flexMenu.js *}}
</li> <li class="pull-right">
<ul class="tabs tabs-extended" role="menu">
{{* All others are moved to this dropdown menu *}} <li role="menuitem" class="dropdown flex-target">
<li class="pull-right"> <a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
<ul class="tabs tabs-extended">
<li class="dropdown">
<a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
<i class="fa fa-chevron-down"></i> <i class="fa fa-chevron-down"></i>
</a> </a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools"> </li>
{{foreach $exttabs as $tab}} </ul>
</li>
</ul>
{{* Tab navigation bar for smartphones *}}
<ul role="menubar" class="tabbar list-inline visible-xs">
{{* The active menupoint will be shown as one menupoint*}}
<li>
<ul class="tabs" role="menu">
{{foreach $tabs as $tab}}
{{if $tab.sel}}
<li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li> <li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
{{/foreach}} {{else}}
</ul> {{$exttabs[]=$tab}}
</li> {{/if}}
</ul> {{/foreach}}
</li>
</ul>
</ul>
</li>
{{* All others are moved to this dropdown menu *}}
<li class="pull-right">
<ul class="tabs tabs-extended">
<li class="dropdown">
<a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
<i class="fa fa-chevron-down"></i>
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
{{foreach $exttabs as $tab}}
<li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
{{/foreach}}
</ul>
</li>
</ul>
</li>
</ul>
</div>

5
view/theme/quattro/dark/style.css
View file

@ -463,7 +463,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
blockquote { blockquote {
background: #ffffff; background: #FFFFFF;
padding: 1em; padding: 1em;
margin-left: 1em; margin-left: 1em;
border-left: 1em solid #e6e6e6; border-left: 1em solid #e6e6e6;
@ -1210,7 +1210,7 @@ section {
.wall-item-container .wall-item-actions-social a { .wall-item-container .wall-item-actions-social a {
margin-right: 3em; margin-right: 3em;
} }
.wall-item-container .wall-item-actions-social a.active { .wall-item-container .wall-item-actions-social a .active {
font-weight: bold; font-weight: bold;
} }
.wall-item-container .wall-item-actions-tools { .wall-item-container .wall-item-actions-tools {
@ -1459,7 +1459,6 @@ blockquote.shared_content {
} }
.oembed.video > a.embed_video { .oembed.video > a.embed_video {
display: block; display: block;
float: left;
position: relative; position: relative;
} }
.oembed.video > a.embed_video > div { .oembed.video > a.embed_video > div {

5
view/theme/quattro/green/style.css
View file

@ -463,7 +463,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
blockquote { blockquote {
background: #ffffff; background: #FFFFFF;
padding: 1em; padding: 1em;
margin-left: 1em; margin-left: 1em;
border-left: 1em solid #e6e6e6; border-left: 1em solid #e6e6e6;
@ -1210,7 +1210,7 @@ section {
.wall-item-container .wall-item-actions-social a { .wall-item-container .wall-item-actions-social a {
margin-right: 3em; margin-right: 3em;
} }
.wall-item-container .wall-item-actions-social a.active { .wall-item-container .wall-item-actions-social a .active {
font-weight: bold; font-weight: bold;
} }
.wall-item-container .wall-item-actions-tools { .wall-item-container .wall-item-actions-tools {
@ -1459,7 +1459,6 @@ blockquote.shared_content {
} }
.oembed.video > a.embed_video { .oembed.video > a.embed_video {
display: block; display: block;
float: left;
position: relative; position: relative;
} }
.oembed.video > a.embed_video > div { .oembed.video > a.embed_video > div {

11
view/theme/quattro/lilac/style.css
View file

@ -420,7 +420,7 @@
body { body {
font-family: Liberation Sans, helvetica, arial, clean, sans-serif; font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
font-size: 11px; font-size: 11px;
background-color: #f6ecf9; background-color: #F6ECF9;
color: #2d2d2d; color: #2d2d2d;
margin: 50px 0 0 0; margin: 50px 0 0 0;
display: table; display: table;
@ -463,7 +463,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
blockquote { blockquote {
background: #ffffff; background: #FFFFFF;
padding: 1em; padding: 1em;
margin-left: 1em; margin-left: 1em;
border-left: 1em solid #e6e6e6; border-left: 1em solid #e6e6e6;
@ -1210,7 +1210,7 @@ section {
.wall-item-container .wall-item-actions-social a { .wall-item-container .wall-item-actions-social a {
margin-right: 3em; margin-right: 3em;
} }
.wall-item-container .wall-item-actions-social a.active { .wall-item-container .wall-item-actions-social a .active {
font-weight: bold; font-weight: bold;
} }
.wall-item-container .wall-item-actions-tools { .wall-item-container .wall-item-actions-tools {
@ -1459,7 +1459,6 @@ blockquote.shared_content {
} }
.oembed.video > a.embed_video { .oembed.video > a.embed_video {
display: block; display: block;
float: left;
position: relative; position: relative;
} }
.oembed.video > a.embed_video > div { .oembed.video > a.embed_video > div {
@ -1772,7 +1771,7 @@ span[id^="showmore-wrap"] {
height: 20px; height: 20px;
width: 500px; width: 500px;
font-weight: bold; font-weight: bold;
border: 1px solid #f6ecf9; border: 1px solid #F6ECF9;
} }
#jot #jot-title:-webkit-input-placeholder { #jot #jot-title:-webkit-input-placeholder {
font-weight: normal; font-weight: normal;
@ -1799,7 +1798,7 @@ span[id^="showmore-wrap"] {
margin: 0; margin: 0;
height: 20px; height: 20px;
width: 200px; width: 200px;
border: 1px solid #f6ecf9; border: 1px solid #F6ECF9;
} }
#jot #jot-category:hover { #jot #jot-category:hover {
border: 1px solid #999999; border: 1px solid #999999;

5
view/theme/quattro/quattro.less
View file

@ -788,12 +788,10 @@ blockquote.shared_content {
border: none; border: none;
} }
.oembed.video { .oembed.video {
> a.embed_video { > a.embed_video {
display: block; display: block;
float: left; position: relative;
position: relative;
> div { > div {
position: absolute; top: 0px; left: 0px; position: absolute; top: 0px; left: 0px;
background: background:
@ -805,7 +803,6 @@ blockquote.shared_content {
} }
} }
/* threaded comments */ /* threaded comments */
.children { .children {
margin-top: 1em; margin-top: 1em;