flewkey/tooty
1
0
Fork 0
Code Releases Activity

Compare commits

base: flewkey:a5309d8cc7cb499fb5572a7120fcffbbfbd6e0c9
Branches Tags
flewkey:master
..
compare: flewkey:592607835ab8d251955b171e817db82286d8d87e
Branches Tags
flewkey:master

No commits in common. "a5309d8cc7cb499fb5572a7120fcffbbfbd6e0c9" and "592607835ab8d251955b171e817db82286d8d87e" have entirely different histories.
a5309d8cc7 ... 592607835a

3 changed files with 15 additions and 52 deletions
Show Stats Expand all files Collapse all files

20
public/style.css
View File

@ -262,15 +262,10 @@ span.applink {
margin-left: 2px;
}
.display-name {
margin-right: 4px;
}
.acct {
font-size: 97%;
font-weight: normal;
color: #a0a0a0;
display: inline-block;
}
.acct-instance-icon {
@ -288,21 +283,6 @@ span.applink {
color: #ccc;
}
.status-mentions {
font-size: 14px;
color: #a0a0a0;
display: block;
margin-bottom: 4px;
}
.status-mentions .mention {
margin: 0 2px;
}
.status-mentions .mention:first-of-type {
margin-left: 4px;
}
.status-text {
margin-left: 60px;
color: #efefef;

17
src/View/Common.elm
View File

@ -3,7 +3,6 @@ module View.Common
( accountAcctView
, accountAvatar
, accountAvatarLink
, accountDisplayName
, accountLink
, accountLinkSmall
, accountLinkLarge
@ -57,7 +56,7 @@ accountLink external account =
[ href account.url
, href <| "#account/" ++ account.id
]
[ span [ class "display-name" ] [ text <| accountDisplayName <| account ]
[ text <| accountDisplayName <| account
, accountAcctView False account
]
@ -75,7 +74,11 @@ accountLinkSmall external account =
[ href account.url
, accountHref
]
[ text <| accountDisplayName <| account
[ text <|
if account.display_name == "" then
account.username
else
account.display_name
]
@ -91,7 +94,11 @@ accountLinkLarge external account =
a
[ href <| "#account/" ++ account.id
]
[ text <| accountDisplayName <| account
[ text <|
if account.display_name == "" then
account.username
else
account.display_name
, br [] []
, accountAcctView True account
]
@ -110,7 +117,7 @@ instanceIconsView url =
accountAcctView : Bool -> Account -> Html Msg
accountAcctView showIcons account =
let
acctText = text <| "@" ++ account.acct
acctText = text <| " @" ++ account.acct
icons =
if showIcons then
instanceIconsView <| account.url

30
src/View/Status.elm
View File

@ -207,35 +207,12 @@ statusActionsView status currentUser showApp =
]
mentionView : Mention -> Html Msg
mentionView mention =
a
[ href mention.url
, class "mention" ]
[ text <| "@" ++ mention.username
]
mentionsView : List Mention -> Html Msg
mentionsView mentions =
let
mentionLinks =
List.map mentionView mentions
in
if (List.isEmpty mentions) then
text ""
else
div [ class "status-mentions" ]
( List.append [ text "Mentioning" ] mentionLinks )
statusContentView : String -> Status -> Html Msg
statusContentView context status =
case status.spoiler_text of
"" ->
div [ class "status-text" ]
[ mentionsView status.mentions
, div [] <| formatContent status.content status.mentions
[ div [] <| formatContent status.content status.mentions
, pollView status
, attachmentListView context status
]
@ -252,8 +229,7 @@ statusContentView context status =
, input [ onClickWithStop NoOp, type_ "checkbox", id statusId, class "spoiler-toggler" ] []
, label [ onClickWithStop NoOp, for statusId ] [ text "Reveal content" ]
, div [ class "spoiled-content" ]
[ mentionsView status.mentions
, div [] <| formatContent status.content status.mentions
[ div [] <| formatContent status.content status.mentions
, pollView status
, attachmentListView context status
]
@ -328,7 +304,7 @@ statusView context ({ account, content, media_attachments, reblog, mentions, pin
, Common.accountAvatarLink False account
, div [ class "username" ]
[ a accountLinkAttributes
[ span [ class "display-name" ] [ text <| Common.accountDisplayName <| account ]
[ text (if account.display_name=="" then account.username else account.display_name)
, Common.accountAcctView True account
]
]