From d4dd863b4b0b75c34a40300737b4892e7a88be20 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 21 Dec 2015 16:19:56 +0100 Subject: [PATCH 1/2] quattro: style managed unread notification --- view/theme/quattro/dark/style.css | 16 ++++++++++++++++ view/theme/quattro/green/style.css | 16 ++++++++++++++++ view/theme/quattro/lilac/style.css | 16 ++++++++++++++++ view/theme/quattro/quattro.less | 18 ++++++++++++++++++ 4 files changed, 66 insertions(+) diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index c5f695679e..1b021687cd 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -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; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index aaca41312b..4c50fb35fa 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -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; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 5801644952..7fb505dec5 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -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; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index abbf447cbb..d47263b500 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -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 { From 770bba021e57b97fee07e0c3b75f5564141ab4de Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 21 Dec 2015 16:41:55 +0100 Subject: [PATCH 2/2] call resizeIframe() function until size is stable (iframe content finished to load, hopefully) should remove scrollbars on rich oembeds --- js/main.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index f67d7183ce..f106b3daf4 100644 --- a/js/main.js +++ b/js/main.js @@ -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) {