changeset 1686:d38274bc398a

merged
author Jaiditya Mathur <jaiditya.mathur@gmail.com>
date Wed, 15 Aug 2012 22:59:44 +0530
parents 741be09d0f03 (diff) 51e1e8b0b7f2 (current diff)
children 36293fcaffbf dfbddf51ef75
files
diffstat 8 files changed, 49 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/foobar/static/css/common.css	Tue Aug 14 00:40:43 2012 +0800
+++ b/MoinMoin/themes/foobar/static/css/common.css	Wed Aug 15 22:59:44 2012 +0530
@@ -174,7 +174,7 @@
 .moin-diff-removed{background-color:#fff5ee;vertical-align:top;width:50%;white-space:pre-wrap;word-wrap:break-word;font-family:monospace;padding:.5em;}
 .moin-diff-removed span{background-color:#f1eeb9}
 body{color:#000;background-color:#d6d5d0;font-family:verdana,sans-serif;background-image:url("../img/base.png")}
-div p{margin:.5em .2em;font-size:.9em;line-height:1.2em;text-align:justify}
+div p{margin:.5em .2em;font-size:.9em;line-height:1.2em}
 #moin-global-tray{float:left;width:16.666666666666668%;padding:.5%;overflow:hidden}
 #moin-main-container{float:left;width:81.13333333333333%;padding:.5%}
 #moin-main-box{background-color:#f4f4f4;border:1px solid #ccc;border-radius:6px;box-shadow:2px 2px 4px #9d9d9b;overflow:hidden}
--- a/MoinMoin/themes/foobar/static/css/stylus/main.styl	Tue Aug 14 00:40:43 2012 +0800
+++ b/MoinMoin/themes/foobar/static/css/stylus/main.styl	Wed Aug 15 22:59:44 2012 +0530
@@ -1,9 +1,11 @@
 // moin2 foobar theme css
+// stylus bug - https://github.com/LearnBoost/stylus/issues/790
+// do NOT end comment lines with colon until the bug is fixed
 
-// include a comment with a notice that the css file is automatically generated:
-@import "stylus_notice.css"
+// includes comments with notice regarding automatically generated css and licensing
+@import "notice.css"
 
-// reset all browser-specific default to have common defaults everywhere:
+// reset all browser-specific default to have common defaults everywhere
 @import "reset.css"
 
 // auto-generated by pygmentize -S default -f html >pygments_default.css
@@ -55,7 +57,6 @@
     margin .5em .2em
     font-size .9em
     line-height 1.2em
-    text-align justify
 
 // the main elements - just the big picture first: panels, header, content, footer
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/themes/foobar/static/css/stylus/notice.css	Wed Aug 15 22:59:44 2012 +0530
@@ -0,0 +1,8 @@
+/* Important note: DO NOT EDIT THIS FILE!
+ *
+ * The CSS seen below is automatically generated using the "stylus" tool.
+ * To modify it, edit the files in the "stylus" directory and re-generate
+ * this file from them:
+ *
+ * stylus --include-css --compress < main.styl > ../common.css
+ */
--- a/MoinMoin/themes/foobar/static/css/stylus/stylus_notice.css	Tue Aug 14 00:40:43 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/* Important note: DO NOT EDIT THIS FILE!
- *
- * The CSS seen below is automatically generated using the "stylus" tool.
- * To modify it, edit the files in the "stylus" directory and re-generate
- * this file from them:
- *
- * stylus --include-css --compress < main.styl > ../common.css
- */
--- a/MoinMoin/themes/modernized/static/css/common.css	Tue Aug 14 00:40:43 2012 +0800
+++ b/MoinMoin/themes/modernized/static/css/common.css	Wed Aug 15 22:59:44 2012 +0530
@@ -9,12 +9,11 @@
 /*
 /* common.css - MoinMoin Default Styles
 
-    Copyright: 2001, 2002, 2003 MoinMoin:JuergenHermann
-    Copyright: 2010 MoinMoin:DiogenesAugusto
-    Copyright: 2010 MoinMoin:RogerHaase
-    License: GNU GPL v2 or later, see COPYING for details.
+  Copyright: 2001, 2002, 2003 MoinMoin:JuergenHermann
+  Copyright: 2010 MoinMoin:DiogenesAugusto
+  Copyright: 2010 MoinMoin:RogerHaase
+  License: GNU GPL v2 or later, see COPYING for details.
 */
-
 /*
 Copied from:  http://code.google.com/p/html5resetcss/
 
@@ -450,14 +449,14 @@
 a.moin-nonexistent:hover{color:#1f9ae0;text-decoration:underline}
 .current-link{color:inherit !important}
 #moin-header{margin:0;padding:0 0 10px 0;background:#708090;color:#fff;line-height:1.12em;border-bottom-left-radius:9px;border-bottom-right-radius:9px}
-#moin-searchform{margin:8px .5em;padding:0;font-size:.82em;float:right;text-align:right}
+#moin-searchform{margin:8px .5em;padding:0;font-size:.82em;float:right;text-align:right;width:15em}
 #moin-searchform input{font-size:100%;vertical-align:middle;background-color:#fff;border:1px solid #4e7da9}
 #moin-searchform #moin-search-submit{text-indent:-9000%;margin-left:-26px;width:20px;height:16px;background:url("../img/moin-search.png") center center no-repeat;background-size:16px 16px;border:none;overflow:hidden;vertical-align:middle;cursor:pointer;padding:0;box-shadow:none}
 #moin-searchform #moin-search-query{padding-right:20px}
 #moin-searchform div{margin:0 5px 0 0}
 #moin-long-searchform{padding:0;font-size:.82em;text-align:left}
 #moin-long-searchform div{margin:0}
-#moin-search-query{width:98%}
+#moin-search-query{width:80%}
 #moin-logo{float:left;margin:5px 10px;padding:0;font-size:1.4em;line-height:1em;font-weight:bold}
 #moin-logo img{vertical-align:middle}
 #moin-logo a{color:#fff;text-decoration:none}
@@ -501,9 +500,10 @@
 #moin-footer hr{margin:0;background-color:#4e7da9}
 #moin-pageinfo,#moin-wikilicense,#moin-credits,#moin-version,#moin-timings{margin:10px 20px;text-align:left;font-size:.7em;color:#737373;}
 #moin-pageinfo a,#moin-wikilicense a,#moin-credits a,#moin-version a,#moin-timings a{color:#737373}
+#moin-pageinfo{margin-top:20px}
 #moin-timings li{display:inline-block;margin:0 20px 0 0}
 #moin-credits span{display:inline-block;margin:0 5px}
-#moin-creditlogos{float:right;list-style:none;margin:0 10px}
+#moin-creditlogos{float:right;list-style:none;margin:5 10px}
 #moin-creditlogos li{display:inline-block;margin:10px 0 10px 10px}
 .moin-item-wrapper{position:relative;display:inline-block}
 .moin-item-wrapper > a:hover{color:#1f9ae0;text-decoration:none}
--- a/MoinMoin/themes/modernized/static/css/stylus/main.styl	Tue Aug 14 00:40:43 2012 +0800
+++ b/MoinMoin/themes/modernized/static/css/stylus/main.styl	Wed Aug 15 22:59:44 2012 +0530
@@ -1,9 +1,11 @@
 //moin2 modernized theme css
+// stylus bug - https://github.com/LearnBoost/stylus/issues/790
+// do NOT end comment lines with colon until the bug is fixed
 
-// include a comment with a notice that the css file is automatically generated:
-@import "stylus_notice.css"
+// includes comments with notice regarding automatically generated css and licensing
+@import "notice.css"
 
-// reset all browser-specific default to have common defaults everywhere:
+// reset all browser-specific default to have common defaults everywhere
 @import "reset.css"
 
 // smileys used by moin wiki parser (and maybe others)
@@ -1214,6 +1216,7 @@
     font-size 0.82em
     float right
     text-align right
+    width 15em
 
 #moin-searchform input
     font-size 100%
@@ -1250,7 +1253,7 @@
     margin 0
 
 #moin-search-query
-    width 98%
+    width 80%
 
 #moin-logo
     float left
@@ -1473,6 +1476,9 @@
     a
         color footer_color
 
+#moin-pageinfo
+    margin-top 20px
+        
 #moin-timings li
     display inline-block
     margin 0 20px 0 0
@@ -1484,7 +1490,7 @@
 #moin-creditlogos
     float right
     list-style none
-    margin 0 10px
+    margin 5 10px
 
 #moin-creditlogos li
     display inline-block
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/themes/modernized/static/css/stylus/notice.css	Wed Aug 15 22:59:44 2012 +0530
@@ -0,0 +1,16 @@
+/* Important note: DO NOT EDIT THIS FILE!
+ *
+ * The CSS seen below is automatically generated using the "stylus" tool.
+ * To modify it, edit the files in the "stylus" directory and re-generate
+ * this file from them:
+ *
+ * stylus --include-css --compress < main.styl > ../common.css
+ */
+/*
+/* common.css - MoinMoin Default Styles
+
+    Copyright: 2001, 2002, 2003 MoinMoin:JuergenHermann
+    Copyright: 2010 MoinMoin:DiogenesAugusto
+    Copyright: 2010 MoinMoin:RogerHaase
+    License: GNU GPL v2 or later, see COPYING for details.
+*/
\ No newline at end of file
--- a/MoinMoin/themes/modernized/static/css/stylus/stylus_notice.css	Tue Aug 14 00:40:43 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/* Important note: DO NOT EDIT THIS FILE!
- *
- * The CSS seen below is automatically generated using the "stylus" tool.
- * To modify it, edit the files in the "stylus" directory and re-generate
- * this file from them:
- *
- * stylus --include-css --compress < main.styl > ../common.css
- */