Move feed icons into the menu bar

Move the RSS and Twitter buttons into the (right edge of the) menu bar.

2 files changed, 26 insertions, 44 deletions

diff --git a/web/input/resources/plugins.css b/web/input/resources/plugins.css
index 187f3df..b368d1d 100644
--- a/web/input/resources/plugins.css
+++ b/web/input/resources/plugins.css
@@ -46,31 +46,6 @@ div#github-ribbon a img {
     border-style: none;
 }
 
-div#feed-area {
-    float: right;
-    margin: 150px 40px 1ex 1em;
-    color: #696969;
-    text-align: center;
-    font-size: small;
-    font-style: italic;
-    font-weight: bold;
-    white-space: nowrap;
-}
-
-div#feed-buttons {
-    margin-top: 1ex;
-    padding: 5px;
-    background-color: #e6e6e6;
-    border-style: none;
-    border-radius: 1em;
-}
-
-div#feed-buttons a img {
-    margin: 5px;
-    vertical-align: middle;
-    border-style: none;
-}
-
 div#page {
     max-width: 45em;
     margin: 1em auto;
@@ -110,6 +85,15 @@ div#menu a:hover {
     color: #eeb76b;
 }
 
+div#menu div#feed-buttons {
+    float: right;
+}
+
+div#menu div#feed-buttons a img {
+    margin-right: 0.6em;
+    border-style: none;
+}
+
 div#breadcrumb {
     padding: 1em 1em 0.2em;
     color: #696969;
diff --git a/web/page.html b/web/page.html
index 37f2e97..ac953eb 100644
--- a/web/page.html
+++ b/web/page.html
@@ -23,26 +23,24 @@
        width="149"
        height="149"/></a>
     </div>
-    <div id="feed-area">Follow us!
-      <div id="feed-buttons">
-        <a
-         href="rss.xml"
-         title="RSS Feed"><img
-         src="resources/rss.png"
-         alt="RSS"
-         width="20"
-         height="20"/></a><a
-         href="https://twitter.com/intent/follow?screen_name=monitorplugins"
-         title="Follow Us on Twitter"><img
-         src="resources/twitter.png"
-         alt="Twitter"
-         width="20"
-         height="20"/></a>
-      </div>
-    </div>
-
     <div id="page">
-      <div id="menu">{% menu() %}</div>
+      <div id="menu">
+        <div id="feed-buttons">
+          <a
+           href="https://twitter.com/intent/follow?screen_name=monitorplugins"
+           title="Follow Us on Twitter"><img
+           src="resources/twitter.png"
+           alt="Twitter"
+           width="20"
+           height="20"/></a><a
+           href="rss.xml"
+           title="RSS Feed"><img
+           src="resources/rss.png"
+           alt="RSS"
+           width="20"
+           height="20"/></a>
+        </div>{% menu() %}
+      </div>
       <div id="breadcrumb">{{ breadcrumb() }}</div>
       <div id="content">{{ __content__ }}</div>
       <div id="footer">Copyright &copy; {{ copyright_years(since=2013) }}