Merge pull request getpelican#250 from magopian/update-links-mnmlist-…

…base-template update some links in mnmlist base template
tomriddle1234 · Sep 20, 2014 · 1de0d42 · 1de0d42
2 parents 26658e5 + f843577
commit 1de0d42
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/mnmlist/compass/src/main.scss b/mnmlist/compass/src/main.scss
@@ -118,6 +118,20 @@ header {
     }
 }
 
+.note {
+    background: #efefef;
+    margin: 1em 0;
+    p {
+        display: inline;
+        &.first {
+            font-weight: bold;
+            &:after {
+                content: ' : ';
+            }
+        }
+    }
+}
+
 footer {
     background: #fff;
     color: #666;

diff --git a/mnmlist/static/css/main.css b/mnmlist/static/css/main.css
@@ -1,3 +1,4 @@
+@import url("pygment.css");
 /*
     Theme Name: mnmlist
     Theme URI: http://mathieu.agopian.info/mnmlist/theme.html
@@ -7,7 +8,6 @@
 
     This theme is uncopyrighted, free, and offered as is.
 */
-@import url("pygment.css");
 /* line 13, ../../compass/src/main.scss */
 body {
   background: #fff;
@@ -145,6 +145,24 @@ header a#page-title {
 }
 
 /* line 121, ../../compass/src/main.scss */
+.note {
+  background: #efefef;
+  margin: 1em 0;
+}
+/* line 124, ../../compass/src/main.scss */
+.note p {
+  display: inline;
+}
+/* line 126, ../../compass/src/main.scss */
+.note p.first {
+  font-weight: bold;
+}
+/* line 128, ../../compass/src/main.scss */
+.note p.first:after {
+  content: ' : ';
+}
+
+/* line 135, ../../compass/src/main.scss */
 footer {
   background: #fff;
   color: #666;
@@ -153,16 +171,16 @@ footer {
   letter-spacing: 4px;
   margin-left: 20px;
 }
-/* line 128, ../../compass/src/main.scss */
+/* line 142, ../../compass/src/main.scss */
 footer a {
   border-bottom: none;
   color: #c0c0c0;
 }
-/* line 132, ../../compass/src/main.scss */
+/* line 146, ../../compass/src/main.scss */
 footer li {
   display: inline;
 }
-/* line 135, ../../compass/src/main.scss */
+/* line 149, ../../compass/src/main.scss */
 footer p {
   text-align: right;
 }
diff --git a/mnmlist/templates/base.html b/mnmlist/templates/base.html
@@ -4,9 +4,9 @@
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        <link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
         {% if FEED_RSS %}
-        <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
 
         <!--[if IE]>