changeset 2780:49184fa45ed7

merge
author RogerHaase <haaserd@gmail.com>
date Fri, 05 Sep 2014 14:02:51 -0700
parents c227de3a4096 (current diff) 946d9e8c8b10 (diff)
children d99532983599
files
diffstat 3 files changed, 7 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/css/common.css	Fri Sep 05 10:22:20 2014 -0700
+++ b/MoinMoin/static/css/common.css	Fri Sep 05 14:02:51 2014 -0700
@@ -105,3 +105,10 @@
 ul.moin-tags li.weight9 {
     font-size: 280%;
 }
+.moin-footnotes {
+    border-top: 1px solid gray;
+    margin: 2em;
+}
+.moin-footnotes p {
+    margin: 1em;
+}
--- a/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Fri Sep 05 10:22:20 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Fri Sep 05 14:02:51 2014 -0700
@@ -1,6 +1,4 @@
 //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
 
 // includes comments with notice regarding automatically generated css and licensing
 @import "notice.css"
@@ -38,12 +36,6 @@
     font-size 1em
     line-height 1.3em
 
-sub
-    vertical-align sub
-
-sup
-    vertical-align super
-
 ins
     background-color inherit // needed for "/* __My Comment__ */"
     text-decoration underline
@@ -303,18 +295,6 @@
     float right
     margin 2px
 
-.moin-footnote a,
-.moin-footnotes sup a
-    font-size .87em
-
-.moin-footnotes
-    border-top border_style
-    margin 0 1em
-
-.moin-footnotes p
-    margin 0 0 .33em 1em
-    font-size .92em
-
 #moin-rev-navigation
     list-style none
     text-align center
@@ -1577,9 +1557,6 @@
     tt, pre
         font-size 16pt
 
-    sup, sub
-        font-size 12pt
-
     table.navigation
         float right
         margin 2px
--- a/MoinMoin/themes/modernized/static/css/theme.css	Fri Sep 05 10:22:20 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/theme.css	Fri Sep 05 14:02:51 2014 -0700
@@ -341,8 +341,6 @@
 .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
 html{color:#000;font-family:Helvetica,Arial,sans-serif}
 p{margin:1em 0;font-size:1em;line-height:1.3em}
-sub{vertical-align:sub}
-sup{vertical-align:super}
 ins{background-color:inherit;text-decoration:underline}
 .moin-big{font-size:1.17em}
 .moin-small{font-size:.83em}
@@ -407,9 +405,6 @@
 .moin-table-of-contents-heading{font-weight:bold;padding:0;margin:0 0 .5em 1em;letter-spacing:.075em}
 .moin-showhide{margin-left:10px}
 table.navigation{background:#fff;float:right;margin:2px}
-.moin-footnote a,.moin-footnotes sup a{font-size:.87em}
-.moin-footnotes{border-top:1px solid #4e7da9;margin:0 1em}
-.moin-footnotes p{margin:0 0 .33em 1em;font-size:.92em}
 #moin-rev-navigation{list-style:none;text-align:center}
 #moin-rev-navigation li{display:inline}
 .moin-disabled{color:#737373}
@@ -674,7 +669,6 @@
 h5{font-size:16pt}
 h6{font-size:14pt}
 tt,pre{font-size:16pt}
-sup,sub{font-size:12pt}
 table.navigation{float:right;margin:2px}
 .navigation td,.navigation a{font-size:10pt;padding:2px}
 #moin-header,#moin-sidebar,#moin-footer,#moin-timings,#moin-credits,#moin-interwiki,#moin-pagelocation,#moin-pageinfo{display:none}