# HG changeset patch
# User Dan
# Date 1192409221 14400
# Node ID b796208d050dfc1de9cae411ae73682e1513d570
# Parent d74ff822acc9252635ba4e8cd6c0a8d8b8093f47# Parent ab6336bfce48fa86f49e8960973cef6add1bb552
Merge between Scribus and Nighthawk
diff -r d74ff822acc9 -r b796208d050d themes/stpatty/css-extra/ie-fixes-shamrock.css
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/stpatty/css-extra/ie-fixes-shamrock.css Sun Oct 14 20:47:01 2007 -0400
@@ -0,0 +1,23 @@
+/*
+ * St. Patty theme for Enano
+ * Copyright (C) 2007 Dan Fuhry
+ *
+ * This theme is Free Software, available under the terms of the GNU General Public License. See the file "GPL" included with this
+ * package for details.
+ */
+
+div#bg {
+ background-image: none;
+}
+div#title {
+ /* background-image: none; */
+}
+div#rap {
+ background-image: url(../images/rap-ie.gif);
+}
+div#sidebar ul li a {
+ margin-bottom: -14px;
+}
+div#pagetools a {
+ padding: 4px 3px;
+}
diff -r d74ff822acc9 -r b796208d050d themes/stpatty/css-extra/ie-fixes.css
--- a/themes/stpatty/css-extra/ie-fixes.css Fri Oct 12 14:41:51 2007 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
- * St. Patty theme for Enano
- * Copyright (C) 2007 Dan Fuhry
- *
- * This theme is Free Software, available under the terms of the GNU General Public License. See the file "GPL" included with this
- * package for details.
- */
-
-div#bg {
- background-image: none;
-}
-div#title {
- /* background-image: none; */
-}
-div#rap {
- background-image: url(../images/rap-ie.gif);
-}
-div#sidebar ul li a {
- margin-bottom: -14px;
-}
-div#pagetools a {
- padding: 4px 3px;
-}
diff -r d74ff822acc9 -r b796208d050d themes/stpatty/header.tpl
--- a/themes/stpatty/header.tpl Fri Oct 12 14:41:51 2007 -0400
+++ b/themes/stpatty/header.tpl Sun Oct 14 20:47:01 2007 -0400
@@ -9,7 +9,7 @@