clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2558 from rabuzarus/0206-share-content 

frio: remove js part for shared-content div because it's now done by …
This commit is contained in:
Michael Vogel 2016-06-02 21:50:38 +02:00
parent 2bd3deb397 cd0d5d6a18
commit 8ac08652ea
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/theme/frio/css/style.css
View File

@ -1255,7 +1255,7 @@ section #jotOpen {
max-height: 480px; max-height: 480px;
object-fit: contain; object-fit: contain;
} }
.shared-content-wrapper, .shared-wrapper,
.vevent { .vevent {
margin-left: 50px; margin-left: 50px;
margin-right: 50px; margin-right: 50px;
@ -1263,13 +1263,13 @@ section #jotOpen {
box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05); box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05);
} }
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
.shared-content-wrapper, .shared-wrapper,
.vevent { .vevent {
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;
} }
} }
.shared-content-wrapper:hover, .shared-wrapper:hover,
.vevent:hover { .vevent:hover {
box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05); box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05);
} }

16
view/theme/frio/js/theme.js
View File

@ -68,22 +68,6 @@ $(document).ready(function(){
if( $("#jot-popup").is(":hidden")) $("#topbar-second > .container > #navbar-button #jotOpen").hide(); if( $("#jot-popup").is(":hidden")) $("#topbar-second > .container > #navbar-button #jotOpen").hide();
} }
// move shared content in it's own DIV (so we can style it better)
$('.wall-item-body .shared_content').each(function() {
// create a DIV after ".shared_content" where we will putt in the shared_header
// and the "shared_content"
$(this).after('<div class="shared-content-wrapper content-card"></div>');
// get the shared_header
var sheader = $(this).prev();
// get the shared-content-wrapper which we have created above
var swrapper = $(this).next();
// move the "shared_header into the new shared_content DIV
$(swrapper).append(sheader);
// move the "shared_content" into the new DIV
$(swrapper).append(this);
});
// show bulk deletion button at network page if checkbox is checked // show bulk deletion button at network page if checkbox is checked
$('input.item-select').change(function(){ $('input.item-select').change(function(){
var checked = false; var checked = false;