nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4708 from goobertron/opengraph_link_fix

Browse source 
Opengraph link fix (issue #4492)
This commit is contained in:
Jonne Haß 2014-03-30 11:03:03 +02:00
commit 3a91061d4f
4 changed files with 44 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -29,6 +29,7 @@
* Fix hovercards in the notificaitons dropdown [#4693](https://github.com/diaspora/diaspora/issues/4693) * Fix hovercards in the notificaitons dropdown [#4693](https://github.com/diaspora/diaspora/issues/4693)
* Do not parse hashtags inside Markdown links [#3692](https://github.com/diaspora/diaspora/issues/3692) * Do not parse hashtags inside Markdown links [#3692](https://github.com/diaspora/diaspora/issues/3692)
* Restore comment textarea content after revealing more comments [#4514](https://github.com/diaspora/diaspora/issues/4514) * Restore comment textarea content after revealing more comments [#4514](https://github.com/diaspora/diaspora/issues/4514)
* OpenGraph: don't make description into links [#4492](https://github.com/diaspora/diaspora/issues/4492)
## Features ## Features
* You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517) * You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517)

32
app/assets/stylesheets/mobile/mobile.css.scss
View file

@ -1127,23 +1127,25 @@ select#aspect_ids_ {
.opengraph { .opengraph {
width: 100%; width: 100%;
display: block;
text-decoration: none;
margin: 5px 0px 5px 0px;
border-top: solid 1px $border-grey;
border-bottom: solid 1px $border-grey;
padding: 5px 0px 2px 0px;
overflow: hidden;
a { a {
display: block;
text-decoration: none;
color: #000; color: #000;
margin: 5px 0px 5px 0px; }
border-top: solid 1px $border-grey; img {
border-bottom: solid 1px $border-grey; margin: 3px 3px 3px 0px;
padding: 5px 0px 2px 0px; float: left;
overflow: hidden; max-width: 80px;
img { padding-right: 5px;
margin: 0px 3px 3px 0px; }
float: left; .og-title {
max-width: 80px; margin-bottom: 3px;
} font-weight: bold;
.og-title {
margin-bottom: 3px;
}
} }
} }

32
app/assets/stylesheets/opengraph.css.scss
View file

@ -1,24 +1,30 @@
.opengraph { .opengraph-container {
width: 100%; width: 100%;
display: block;
text-decoration: none;
font-style: normal;
margin: 10px 0px 10px 0px;
border-top: solid 1px $border-grey;
border-bottom: solid 1px $border-grey;
padding: 10px 0px 5px 0px;
overflow: hidden;
a { a {
display: block;
text-decoration: none;;
color: #000; color: #000;
margin: 10px 0px 10px 0px;
border-top: solid 1px $border-grey;
border-bottom: solid 1px $border-grey;
padding: 10px 0px 5px 0px;
overflow: hidden;
img { img {
margin: 0px 5px 5px 0px; margin: 5px 5px 5px 0px;
float: left; float: left;
max-width: 155px; max-width: 150px;
padding-right: 5px;
} }
.og-title { .og-title {
margin-bottom: 5px; margin-bottom: 5px;
font-weight: bold;
} }
} }
a:hover {
color: $blue;
}
.og-description {
color: $text-grey;
}
} }

13
app/assets/templates/opengraph_tpl.jst.hbs
View file

@ -1,11 +1,12 @@
{{#unless o_embed_cache}} {{#unless o_embed_cache}}
{{#if open_graph_cache}} {{#if open_graph_cache}}
<a href="{{open_graph_cache.url}}" target="_blank"> <div class="opengraph-container">
<div> <a href="{{open_graph_cache.url}}" target="_blank">
<img src="{{open_graph_cache.image}}" /> <img src="{{open_graph_cache.image}}" />
<strong>{{open_graph_cache.title}}</strong> <p class="og-title">{{open_graph_cache.title}}</p>
<p>{{open_graph_cache.description}}</p> </a>
</div> <p class="og-description">{{open_graph_cache.description}}</p>
</a> </div>
{{/if}} {{/if}}
{{/unless}} {{/unless}}