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

Merge pull request #2195 from fabrixxm/last-minute

Browse source 
Last minute
This commit is contained in:
Michael Vogel 2015-12-21 22:50:51 +01:00
commit 1b0b4d8c57
5 changed files with 82 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
js/main.js
View file

@ -1,6 +1,21 @@
function resizeIframe(obj) {
obj.style.height = 0;
obj.style.height = obj.contentWindow.document.body.scrollHeight + 'px';
_resizeIframe(obj, 0);
}
function _resizeIframe(obj, desth) {
var h = obj.style.height;
var ch = obj.contentWindow.document.body.scrollHeight + 'px';
if (h==ch) {
return;
}
console.log("_resizeIframe", obj, desth, ch);
if (desth!=ch) {
setTimeout(_resizeIframe, 500, obj, ch);
} else {
obj.style.height = ch;
setTimeout(_resizeIframe, 1000, obj, ch);
}
}
function openClose(theID) {

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

@ -2113,6 +2113,22 @@ ul.tabs li .active {
width: 50px;
float: left;
}
/* manage page */
.identity-match-photo {
position: relative;
}
.identity-match-photo .manage-notify {
background-color: #19AEFF;
border-radius: 5px;
font-size: 10px;
padding: 1px 3px;
min-width: 15px;
text-align: right;
position: absolute;
right: 10px;
top: -5px;
color: #ffffff;
}
/* videos page */
.videos .video-top-wrapper {
width: 200px;

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

@ -2113,6 +2113,22 @@ ul.tabs li .active {
width: 50px;
float: left;
}
/* manage page */
.identity-match-photo {
position: relative;
}
.identity-match-photo .manage-notify {
background-color: #19AEFF;
border-radius: 5px;
font-size: 10px;
padding: 1px 3px;
min-width: 15px;
text-align: right;
position: absolute;
right: 10px;
top: -5px;
color: #ffffff;
}
/* videos page */
.videos .video-top-wrapper {
width: 200px;

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

@ -2113,6 +2113,22 @@ ul.tabs li .active {
width: 50px;
float: left;
}
/* manage page */
.identity-match-photo {
position: relative;
}
.identity-match-photo .manage-notify {
background-color: #19AEFF;
border-radius: 5px;
font-size: 10px;
padding: 1px 3px;
min-width: 15px;
text-align: right;
position: absolute;
right: 10px;
top: -5px;
color: #ffffff;
}
/* videos page */
.videos .video-top-wrapper {
width: 200px;

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

@ -1404,6 +1404,24 @@ ul.tabs {
width: 50px; float: left;
}
/* manage page */
.identity-match-photo {
position: relative;
.manage-notify {
background-color: #19AEFF;
border-radius: 5px;
font-size: 10px;
padding: 1px 3px;
min-width: 15px;
text-align: right;
position: absolute;
right: 10px;
top: -5px;
color: rgb(255, 255, 255);
}
}
/* videos page */
.videos {
.video-top-wrapper {