From 9919de9a6c0c49932407f9c94b603992e660d5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 3 May 2016 10:22:23 +0200
Subject: [PATCH] Added padding to announcement reader content pane

---
 .../plugins/announcements/static/css/announcements.css        | 2 +-
 .../plugins/announcements/static/less/announcements.less      | 2 ++
 .../plugins/announcements/templates/announcements.jinja2      | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/octoprint/plugins/announcements/static/css/announcements.css b/src/octoprint/plugins/announcements/static/css/announcements.css
index 496b8c7b..08e9a9bd 100644
--- a/src/octoprint/plugins/announcements/static/css/announcements.css
+++ b/src/octoprint/plugins/announcements/static/css/announcements.css
@@ -1 +1 @@
-table td.settings_plugin_announcements_channels_name,table th.settings_plugin_announcements_channels_name{text-overflow:ellipsis;text-align:left}table td.settings_plugin_announcements_channels_actions,table th.settings_plugin_announcements_channels_actions{text-align:center;width:80px}table td.settings_plugin_announcements_channels_actions a,table th.settings_plugin_announcements_channels_actions a{text-decoration:none;color:#000}table td.settings_plugin_announcements_channels_actions a.disabled,table th.settings_plugin_announcements_channels_actions a.disabled{color:#ccc;cursor:default}#plugin_announcements_dialog .unread{font-weight:700}#plugin_announcements_dialog article.read{opacity:.5}#plugin_announcements_dialog article.read:hover{opacity:1}#plugin_announcements_dialog article .actions{background-color:#f5f5f5;border-radius:2px;padding:2px 5px;margin-top:5px}#plugin_announcements_dialog article .actions .markread{float:right}#plugin_announcements_dialog article .actions a{color:#000}
\ No newline at end of file
+table td.settings_plugin_announcements_channels_name,table th.settings_plugin_announcements_channels_name{text-overflow:ellipsis;text-align:left}table td.settings_plugin_announcements_channels_actions,table th.settings_plugin_announcements_channels_actions{text-align:center;width:80px}table td.settings_plugin_announcements_channels_actions a,table th.settings_plugin_announcements_channels_actions a{text-decoration:none;color:#000}table td.settings_plugin_announcements_channels_actions a.disabled,table th.settings_plugin_announcements_channels_actions a.disabled{color:#ccc;cursor:default}#plugin_announcements_dialog .unread{font-weight:700}#plugin_announcements_dialog article{padding-right:20px}#plugin_announcements_dialog article.read{opacity:.5}#plugin_announcements_dialog article.read:hover{opacity:1}#plugin_announcements_dialog article .actions{background-color:#f5f5f5;border-radius:2px;padding:2px 5px;margin-top:5px}#plugin_announcements_dialog article .actions .markread{float:right}#plugin_announcements_dialog article .actions a{color:#000}
\ No newline at end of file
diff --git a/src/octoprint/plugins/announcements/static/less/announcements.less b/src/octoprint/plugins/announcements/static/less/announcements.less
index 35f0f667..1f57d796 100644
--- a/src/octoprint/plugins/announcements/static/less/announcements.less
+++ b/src/octoprint/plugins/announcements/static/less/announcements.less
@@ -28,6 +28,8 @@ table {
   }
 
   article {
+    padding-right: 20px;
+
     &.read {
       opacity: 0.5;
     }
diff --git a/src/octoprint/plugins/announcements/templates/announcements.jinja2 b/src/octoprint/plugins/announcements/templates/announcements.jinja2
index 1038024d..6c565254 100644
--- a/src/octoprint/plugins/announcements/templates/announcements.jinja2
+++ b/src/octoprint/plugins/announcements/templates/announcements.jinja2
@@ -22,10 +22,10 @@
                     <!-- ko if: $data.enabled || $data.forced -->
                     <div class="tab-pane" data-bind="attr: {id: 'plugin_announcements_dialog_channel_' + $data.key}">
                         <!-- ko foreach: $data.data -->
-                        <hr data-bind="visible: $index() > 0">
                         <article data-bind="css: {read: $data.read}">
+                            <hr data-bind="visible: $index() > 0">
                             <h3><a data-bind="text: $data.title, attr: {href: $data.link}" target="_blank" rel="noreferrer noopener"></a> <small data-bind="text: formatTimeAgo($data.published), attr: {title: formatDate($data.published)}"></small></h3>
-                            <div data-bind="html: $data.summary"></div>
+                            <div class="content" data-bind="html: $data.summary"></div>
                             <div class="actions">
                                 <span class="articlelink"><small><a data-bind="text: $data.link, attr: {href: $data.link}" target="_blank" rel="noreferrer noopener"></a></small></span>
                                 <span class="markread"><small><a href="javascript:void(0)" data-bind="click: function() { $root.markRead($parent.key, $data.published) }"><i class="icon-eye-open"></i> {{ _('Mark as last read') }}</a></small></span>