diff --git a/Changelog.md b/Changelog.md index 23a99f9d4..af64e5f49 100644 --- a/Changelog.md +++ b/Changelog.md @@ -29,6 +29,7 @@ * 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) * 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 * You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517) diff --git a/app/assets/stylesheets/mobile/mobile.css.scss b/app/assets/stylesheets/mobile/mobile.css.scss index 8da30b618..f77786099 100644 --- a/app/assets/stylesheets/mobile/mobile.css.scss +++ b/app/assets/stylesheets/mobile/mobile.css.scss @@ -1127,23 +1127,25 @@ select#aspect_ids_ { .opengraph { 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 { - display: block; - text-decoration: none; color: #000; - margin: 5px 0px 5px 0px; - border-top: solid 1px $border-grey; - border-bottom: solid 1px $border-grey; - padding: 5px 0px 2px 0px; - overflow: hidden; - img { - margin: 0px 3px 3px 0px; - float: left; - max-width: 80px; - } - .og-title { - margin-bottom: 3px; - } + } + img { + margin: 3px 3px 3px 0px; + float: left; + max-width: 80px; + padding-right: 5px; + } + .og-title { + margin-bottom: 3px; + font-weight: bold; } } diff --git a/app/assets/stylesheets/opengraph.css.scss b/app/assets/stylesheets/opengraph.css.scss index fc2be5447..b0f877e4c 100644 --- a/app/assets/stylesheets/opengraph.css.scss +++ b/app/assets/stylesheets/opengraph.css.scss @@ -1,24 +1,30 @@ -.opengraph { +.opengraph-container { 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 { - display: block; - text-decoration: none;; 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 { - margin: 0px 5px 5px 0px; + margin: 5px 5px 5px 0px; float: left; - max-width: 155px; + max-width: 150px; + padding-right: 5px; } - .og-title { margin-bottom: 5px; + font-weight: bold; } } + a:hover { + color: $blue; + } + .og-description { + color: $text-grey; + } } diff --git a/app/assets/templates/opengraph_tpl.jst.hbs b/app/assets/templates/opengraph_tpl.jst.hbs index 15da820eb..fd1a66853 100644 --- a/app/assets/templates/opengraph_tpl.jst.hbs +++ b/app/assets/templates/opengraph_tpl.jst.hbs @@ -1,11 +1,12 @@ {{#unless o_embed_cache}} {{#if open_graph_cache}} - -
+
+ - {{open_graph_cache.title}} -

{{open_graph_cache.description}}

-
- +

{{open_graph_cache.title}}

+ +

{{open_graph_cache.description}}

+
{{/if}} {{/unless}} +