changeset 2854:175a55db6fae

fix #472 Basic Theme lacks CSS for ordered lists, definition lists, horizontal rules, headings, TOC
author RogerHaase <haaserd@gmail.com>
date Fri, 21 Nov 2014 11:36:16 -0700
parents 77d9fd0d6504
children b6eb462021ed
files MoinMoin/static/css/common.css MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/modernized/static/css/stylus/theme.styl MoinMoin/themes/modernized/static/css/theme.css
diffstat 6 files changed, 54 insertions(+), 179 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/css/common.css	Thu Nov 20 08:20:14 2014 -0700
+++ b/MoinMoin/static/css/common.css	Fri Nov 21 11:36:16 2014 -0700
@@ -226,3 +226,55 @@
 #moin-version,
 #moin-timings { margin: 10px 20px; text-align: left; font-size: .7em; color: #737373; float: left; clear: left; }
 #moin-creditlogos { clear: both; float: right; }
+
+/* ordered lists */
+ol,
+ul { margin-top: .5em; margin-bottom: .5em; }
+li p { margin: .25em 0; }
+ol.moin-upperalpha-list { list-style-type: upper-alpha; }
+ol.moin-loweralpha-list { list-style-type: lower-alpha; }
+ol.moin-upperroman-list { list-style-type: upper-roman; }
+ol.moin-lowerroman-list { list-style-type: lower-roman; }
+ul.moin-nobullet-list { list-style-type: none; }
+li ol,
+li ul { margin-top: .25em; }
+
+/* definition lists */
+dt { margin-top: .5em; font-weight: bold; }
+dl > dd { font-size: .92em; margin-left: 3em; margin-top: 0; margin-bottom: 0; }
+dd p { margin: .25em 0; }
+dd + dd p { margin-top: .67em; }
+blockquote { padding-left: 2em; }
+
+/* horizontal rules */
+hr { height: 1px; background-color: #4e7da9; border: 0; margin: .9em 0; }
+.moin-hr1 { height: 2px; }
+.moin-hr2 { height: 3px; }
+.moin-hr3 { height: 5px; }
+.moin-hr4 { height: 7px; }
+.moin-hr5 { height: 9px; }
+.moin-hr6 { height: 12px; }
+
+/* headings */
+h1 { font-size: 2em; margin: .67em 0; border-bottom: 5px solid #4e7da9; padding-bottom: 5px; }
+h2 { font-size: 1.5em; margin: .75em 0; padding-bottom: 4px; }
+h3 { font-size: 1.17em; margin: .83em 0; padding-bottom: 3px; }
+h4 { margin: 1.12em 0; padding-bottom: 2px; }
+h5 { font-size: .83em; margin: 1.5em 0; padding-bottom: 2px; }
+h6 { font-size: .75em; margin: 1.67em 0; padding-bottom: 2px; }
+h2,
+h3,
+h4,
+h5,
+h6 { border-bottom: 3px solid #4e7da9; }
+
+/* table of contents (div.toc is for markdown parser) */
+div.moin-table-of-contents,
+div.toc { border: 1px solid #4e7da9; color: #000; background: #fff; font-size: 80%; margin: .5em 0 .75em 1em;
+    padding: .5em .75em .5em .5em; text-indent: -1em; max-width: 35%; text-align: left; float: right;
+    clear: both; box-shadow: 3px 3px 6px #9d9d9b; border-radius: 15px; }
+div.moin-table-of-contents ol,
+div.toc ol { margin: 0; padding: 0 0 0 .92em; }
+div.moin-table-of-contents li,
+div.toc li { margin: .12em 0 0 0; padding: 0; list-style: none; }
+div.moin-table-of-contents-heading { font-weight: bold; padding: 0; margin: 0 0 .5em 1em; letter-spacing: .075em; }
--- a/MoinMoin/themes/basic/static/css/theme.css	Thu Nov 20 08:20:14 2014 -0700
+++ b/MoinMoin/themes/basic/static/css/theme.css	Fri Nov 21 11:36:16 2014 -0700
@@ -6435,9 +6435,6 @@
   -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
   box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
 }
-.moin-location-breadcrumb {
-  display: inline;
-}
 .moin-nonexistent {
   color: #e7908e !important;
 }
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Thu Nov 20 08:20:14 2014 -0700
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Fri Nov 21 11:36:16 2014 -0700
@@ -149,10 +149,6 @@
   }
 }
 
-.moin-location-breadcrumb {
-  display: inline;
-}
-
 .moin-nonexistent {
   color: @link-nonexistent-color !important;
   &:hover {
--- a/MoinMoin/themes/basic/templates/layout.html	Thu Nov 20 08:20:14 2014 -0700
+++ b/MoinMoin/themes/basic/templates/layout.html	Fri Nov 21 11:36:16 2014 -0700
@@ -218,7 +218,7 @@
                                 </li>
                             {% else %}
                                 <li>
-                                    <h4 class="moin-location-breadcrumb">
+                                    <big class="moin-location-breadcrumb">
                                         {% for segment_name, segment_path, exists in theme_supp.location_breadcrumbs(fqname) -%}
                                             {% if loop.first %}
                                                 <small>~ /</small>
@@ -238,7 +238,7 @@
                                                 {%- endif %}
                                             {%- endif %}
                                         {% endfor %}
-                                    </h4>
+                                    </big>
                                     <ul class="moin-bcs-subitems">
                                         {% for fq_name in theme_supp.get_fqnames(fqname) -%}
                                             <li>
--- a/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Thu Nov 20 08:20:14 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Fri Nov 21 11:36:16 2014 -0700
@@ -40,39 +40,6 @@
 .moin-inline-label
     display inline
 
-h1
-    font-size 2em
-    margin .67em 0
-    border-bottom 5px solid border_color
-    padding-bottom 5px
-
-h2
-    font-size 1.5em
-    margin .75em 0
-    padding-bottom 4px
-
-h3
-    font-size 1.17em
-    margin .83em 0
-    padding-bottom 3px
-
-h4
-    margin 1.12em 0
-    padding-bottom 2px
-
-h5
-    font-size .83em
-    margin 1.5em 0
-    padding-bottom 2px
-
-h6
-    font-size .75em
-    margin 1.67em 0
-    padding-bottom 2px
-
-h2,h3,h4,h5,h6
-    border-bottom 3px solid border_color
-
 a
     text-decoration none
 
@@ -96,80 +63,6 @@
         background nonexistent_link_color
         border 3px dashed footer_color
 
-ol, ul
-    margin-left 3em
-
-ol ol, ul ul, ol ul, ul ol
-    margin-left 2em
-
-li p
-    margin .25em 0
-
-ol.moin-upperalpha-list
-    list-style-type upper-alpha
-
-ol.moin-loweralpha-list
-    list-style-type lower-alpha
-
-ol.moin-upperroman-list
-    list-style-type upper-roman
-
-ol.moin-lowerroman-list
-    list-style-type lower-roman
-
-ul.moin-nobullet-list
-    list-style-type none
-
-ol, ul
-    margin-top .5em
-    margin-bottom .5em
-
-li ol, li ul
-    margin-top .25em
-
-dt
-    margin-top 0.5em
-    font-weight bold
-
-dd
-    font-size .92em
-    margin-left 40px
-    margin-top 0
-    margin-bottom 0
-
-dd p
-    margin 0.25em 0
-
-dd + dd p
-    margin-top .67em
-
-blockquote
-    margin-left 2em
-
-hr
-    height 1px
-    background-color border_color
-    border 0
-    margin .9em 0
-
-.moin-hr1
-    height 2px
-
-.moin-hr2
-    height 3px
-
-.moin-hr3
-    height 5px
-
-.moin-hr4
-    height 7px
-
-.moin-hr5
-    height 9px
-
-.moin-hr6
-    height 12px
-
 .moin-error
     color error_color
     background table_bg_color
@@ -201,36 +94,6 @@
 .moin-thead
     background-color header_bg_color
 
-div.moin-table-of-contents
-    border border_style
-    color font_color
-    background page_color
-    font-size 80%
-    margin 0.5em 0 0.75em 1em
-    padding 0.5em 0.75em 0.5em 0.5em
-    text-indent -1em
-    max-width 35%
-    text-align left
-    float right
-    clear both
-    box-shadow 3px 3px 6px shadow_color
-    border-radius 15px
-
-.moin-table-of-contents ol
-    margin 0
-    padding 0 0 0 .92em
-
-.moin-table-of-contents li
-    margin .12em 0 0 0
-    padding 0
-    list-style none
-
-.moin-table-of-contents-heading
-    font-weight bold
-    padding 0
-    margin 0 0 0.5em 1em
-    letter-spacing 0.075em
-
 .moin-showhide
     margin-left 10px
 
--- a/MoinMoin/themes/modernized/static/css/theme.css	Thu Nov 20 08:20:14 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/theme.css	Fri Nov 21 11:36:16 2014 -0700
@@ -293,13 +293,6 @@
 .moin-big{font-size:1.17em}
 .moin-small{font-size:.83em}
 .moin-inline-label{display:inline}
-h1{font-size:2em;margin:.67em 0;border-bottom:5px solid #4e7da9;padding-bottom:5px}
-h2{font-size:1.5em;margin:.75em 0;padding-bottom:4px}
-h3{font-size:1.17em;margin:.83em 0;padding-bottom:3px}
-h4{margin:1.12em 0;padding-bottom:2px}
-h5{font-size:.83em;margin:1.5em 0;padding-bottom:2px}
-h6{font-size:.75em;margin:1.67em 0;padding-bottom:2px}
-h2,h3,h4,h5,h6{border-bottom:3px solid #4e7da9}
 a{text-decoration:none}
 a:link{color:#00008b}
 a:visited{color:#008b8b}
@@ -307,38 +300,12 @@
 a:active{color:#51d443}
 a.moin-nonexistent:visited,a.moin-nonexistent{color:#939393;}
 a.moin-nonexistent:visited img,a.moin-nonexistent img,a.moin-nonexistent:visited object,a.moin-nonexistent object{background:#939393;border:3px dashed #737373}
-ol,ul{margin-left:3em}
-ol ol,ul ul,ol ul,ul ol{margin-left:2em}
-li p{margin:.25em 0}
-ol.moin-upperalpha-list{list-style-type:upper-alpha}
-ol.moin-loweralpha-list{list-style-type:lower-alpha}
-ol.moin-upperroman-list{list-style-type:upper-roman}
-ol.moin-lowerroman-list{list-style-type:lower-roman}
-ul.moin-nobullet-list{list-style-type:none}
-ol,ul{margin-top:.5em;margin-bottom:.5em}
-li ol,li ul{margin-top:.25em}
-dt{margin-top:.5em;font-weight:bold}
-dd{font-size:.92em;margin-left:40px;margin-top:0;margin-bottom:0}
-dd p{margin:.25em 0}
-dd + dd p{margin-top:.67em}
-blockquote{margin-left:2em}
-hr{height:1px;background-color:#4e7da9;border:0;margin:.9em 0}
-.moin-hr1{height:2px}
-.moin-hr2{height:3px}
-.moin-hr3{height:5px}
-.moin-hr4{height:7px}
-.moin-hr5{height:9px}
-.moin-hr6{height:12px}
 .moin-error{color:#ff2727;background:#eef1f6;padding:4px}
 .moin-highlight{background-color:#d8dfe9;padding:1px}
 pre{border:1px solid #4e7da9;background-color:#aed4fa;padding:5px;clear:both;font-family:monospace;margin:.33em 0;white-space:pre-wrap}
 pre.comment{background-color:#00417f;color:#fff;padding:0;margin:0;border:0}
 pre.comment:before{content:url("../img/attention.png")}
 .moin-thead{background-color:#00417f}
-div.moin-table-of-contents{border:1px solid #4e7da9;color:#000;background:#fff;font-size:80%;margin:.5em 0 .75em 1em;padding:.5em .75em .5em .5em;text-indent:-1em;max-width:35%;text-align:left;float:right;clear:both;box-shadow:3px 3px 6px #9d9d9b;border-radius:15px}
-.moin-table-of-contents ol{margin:0;padding:0 0 0 .92em}
-.moin-table-of-contents li{margin:.12em 0 0 0;padding:0;list-style:none}
-.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-rev-navigation{list-style:none;text-align:center}