diff --git a/action.php b/action.php index 1dee695..b6701fa 100644 --- a/action.php +++ b/action.php @@ -276,6 +276,24 @@ foreach($_GET as $key => $value){ case "userinfo": $info = api_get("accounts/".htmlentities($value)); $rel = api_get("accounts/relationships?id=".htmlentities($value)); + $photos = api_get("accounts/".htmlentities($value)."/statuses?only_media=true&limit=5&exclude_reblogs=true"); + $photo = array(); + $c = 0; + if (!empty($photos)){ + foreach ($photos as $elem){ + if ($elem['media_attachments'][0]['type'] == "image"){ + $photo[$c]['url'] = $elem['media_attachments'][0]['url']; + if ($elem['sensitive'] == true){ + $photo[$c]['s'] = true; + } + $c++; + + } + if ($c == 3){ + break; + } + } + } echo "
@@ -291,6 +309,11 @@ foreach($_GET as $key => $value){ ".(in_array($info['id'],$user_settings['nsfw']) ? "NSFW " : "NSFW " )." ".($logedin ? "" . ($rel[0]['muting'] ? " Unmute" : " Mute") . "" : "")." +
"; + foreach ($photo as $elem){ + echo "
"; + } + echo "
"; die(); @@ -367,3 +390,4 @@ if(isset($_POST['status'])){ die(); } + diff --git a/css/color.css b/css/color.css index b8ef6b1..242f432 100644 --- a/css/color.css +++ b/css/color.css @@ -260,7 +260,14 @@ input[type="submit"] { } .post_footer { - background-color: #eee; + background-color: transparent; +} + +.felem a:hover > span { + background-color:white; + box-shadow: 1px 1px 2px rgba(0,0,0,0.5); + color: black !important; + border-radius:4px; } .public::after { diff --git a/css/mobile.css b/css/mobile.css index 69e41c0..ea7369f 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -55,6 +55,7 @@ input[type="file"], .nloadmore { textarea { resize: none; + font-size:12px !important; } /* omnipresent */ @@ -110,6 +111,16 @@ textarea { margin:0px !important; text-align: left; word-break: break-all; + font-size:12px !important; +} + +.content * { + + font-size:12px !important; +} + +.content .emoji { + height:19px !important; } aside { @@ -288,7 +299,7 @@ aside { } .element { - width: 90% !important; + width: 100% !important; clear: both; display: inline-block; margin-top: 3px; @@ -369,10 +380,18 @@ aside { } .felem { - margin-left: 7px; + margin-left: 16px; float: left; } +.felem a { + font-size:20px !important; +} + +.felem a > span { + font-size:small; +} + .contact{ background-color:white; cursor: pointer; @@ -403,7 +422,7 @@ aside { float: left; text-align: center; position: relative; - border-radius: 3px; + border-radius: 0px; } .postform,.searchmobile { @@ -427,16 +446,8 @@ aside { text-align: left; } -.postHeader div { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - - - .postHeader *,.post_footer *{ - font-size:small; + font-size:12px; } .previewpost { @@ -534,6 +545,10 @@ aside { margin: 15px; } +.postAge,.public:after,.unlisted:after,.private:after,.direct:after { + font-size:11px; +} + .post_footer { width: 630px; display: table-cell; @@ -544,8 +559,9 @@ aside { border-radius: 3px; } + .post_buttons { - font-family: fontello; + font-family: fontello, sans-serif; float: right; display: inline-block; text-align: right; @@ -557,7 +573,7 @@ aside { font-family: inherit; text-decoration: none; color: inherit; - font-size: inherit; + font-family: fontello, sans-serif; } .reply { @@ -565,6 +581,11 @@ aside { clear: both; text-align: left; display: block; + border-bottom:1px dotted #aaa; +} + +.replyflex { + flex: 6 !important; } .note { diff --git a/css/style.css b/css/style.css index d816861..505389a 100644 --- a/css/style.css +++ b/css/style.css @@ -345,6 +345,10 @@ aside { padding:0px; } +.reply .postMenu { + margin-right:15px !important; +} + .profileMenu:hover > div, .listmenu:hover > div{ display:block !important; } @@ -363,6 +367,30 @@ aside { float: left; } +.felem a { + font-size:20px !important; + position:relative; +} + +.notif .felem a { + font-size:13px !important; +} + +.felem a > span { + display:none; +} + +.felem a:hover > span { + display:block; + position:absolute; + width:30px; + height:27px; + top:-35px; + left:-5px; + text-align:center; + padding-top:3px; +} + .contact{ background-color:white; cursor: pointer; @@ -526,8 +554,20 @@ aside { border-radius: 3px; } +.postAge,.public:after,.unlisted:after,.private:after,.direct:after { + font-size:12px; +} + +.reply:hover .post_buttons,.reply:hover .postMenu { + display:block !important; +} + +.replyflex { + flex:9; +} + .post_buttons { - font-family: fontello; + font-family: fontello, sans-serif; float: right; display: inline-block; text-align: right; @@ -536,7 +576,7 @@ aside { .post_buttons a, .post_buttons span { - font-family: inherit; + font-family: fontello, sans-serif; text-decoration: none; color: inherit; font-size: inherit; @@ -547,6 +587,7 @@ aside { clear: both; text-align: left; display: block; + border-bottom:1px dotted #aaa; } .note { diff --git a/include/functions.php b/include/functions.php index ec9a5c4..9f95d84 100644 --- a/include/functions.php +++ b/include/functions.php @@ -43,7 +43,7 @@ function get_urls($input) { shortcodes and the emoji url is defined in the same place */ function emojify($string, $emojis, $size = 40) { foreach ($emojis as $emoji) { - $string = str_replace(":" . $emoji['shortcode'] . ":", "" . $emoji[", $string); + $string = str_replace(":" . $emoji['shortcode'] . ":", "" . $emoji[", $string); } return $string; } @@ -321,8 +321,9 @@ function render_reply($item) { $reply['id'] = $item['id']; $reply['uid'] = $item['account']['id']; - $reply['name'] = emojify($item['account']['display_name'], $item['account']['emojis'], 15); + $reply['name'] = emojify($item['account']['display_name'], $item['account']['emojis'], 20); $reply['acct'] = $item['account']['acct']; + $reply['handle'] = "@".explode("@",$item['account']['acct'])[0]; $reply['avatar'] = $item['account']['avatar']; $reply['menu'] = "