Skip to content

D
django-wiki
Commit d8149a6e by benjaoming
Options

fix #182 - bootstrap problem, not html

parent be42a269
Showing with 48 additions and 38 deletions
wiki/static/wiki/bootstrap/css/wiki-bootstrap.css
...@@ -4150,45 +4150,30 @@ h1#article-title { ...@@ -4150,45 +4150,30 @@ h1#article-title {
} }
.wiki-article div.toc ul, .wiki-article div.toc ul,
.wiki-article div.article-list ul { .wiki-article div.article-list ul {
position: absolute; padding-left: 0;
top: 100%;
left: 0;
z-index: 1000;
display: none;
float: left;
min-width: 160px;
padding: 5px 0;
margin: 2px 0 0;
list-style: none; list-style: none;
background-color: #ffffff;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
} }
.wiki-article div.toc ul.pull-right, .wiki-article div.toc > ul,
.wiki-article div.article-list ul.pull-right { .wiki-article div.article-list > ul {
right: 0; -webkit-border-radius: 5px;
left: auto; -moz-border-radius: 5px;
border-radius: 5px;
background-color: #f6f6f6;
padding-top: 5px;
} }
.wiki-article div.toc ul .divider, .wiki-article div.toc ul li ul li,
.wiki-article div.article-list ul .divider { .wiki-article div.article-list ul li ul li {
height: 1px; padding-left: 10px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
} }
.wiki-article div.toc ul > li > a, .wiki-article div.toc ul li a,
.wiki-article div.article-list ul > li > a { .wiki-article div.article-list ul li a {
padding: 5px 10px;
display: block; display: block;
padding: 3px 20px; border-bottom: 1px solid #DDD;
clear: both; }
font-weight: normal; .wiki-article div.toc ul li:last-child,
line-height: 1.428571429; .wiki-article div.article-list ul li:last-child {
color: #333333; margin-bottom: 7px;
white-space: nowrap;
} }
.wiki-article div.toc .toctitle { .wiki-article div.toc .toctitle {
display: block; display: block;
......
wiki/static/wiki/bootstrap/css/wiki-bootstrap.min.css
...@@ -550,9 +550,11 @@ h1#article-title{font-size:2.5em;margin-top:0px;} ...@@ -550,9 +550,11 @@ h1#article-title{font-size:2.5em;margin-top:0px;}
#attachment_form #id_description{width:95%;} #attachment_form #id_description{width:95%;}
#wiki-edit-sidebar .accordion{margin-bottom:5px;} #wiki-edit-sidebar .accordion{margin-bottom:5px;}
.wiki-article div.toc,.wiki-article div.article-list{max-width:340px;clear:left;} .wiki-article div.toc,.wiki-article div.article-list{max-width:340px;clear:left;}
.wiki-article div.toc ul,.wiki-article div.article-list ul{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #cccccc;border:1px solid rgba(0, 0, 0, 0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0, 0, 0, 0.175);box-shadow:0 6px 12px rgba(0, 0, 0, 0.175);background-clip:padding-box;}.wiki-article div.toc ul.pull-right,.wiki-article div.article-list ul.pull-right{right:0;left:auto;} .wiki-article div.toc ul,.wiki-article div.article-list ul{padding-left:0;list-style:none;}
.wiki-article div.toc ul .divider,.wiki-article div.article-list ul .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5;} .wiki-article div.toc>ul,.wiki-article div.article-list>ul{-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background-color:#f6f6f6;padding-top:5px;}
.wiki-article div.toc ul>li>a,.wiki-article div.article-list ul>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333333;white-space:nowrap;} .wiki-article div.toc ul li ul li,.wiki-article div.article-list ul li ul li{padding-left:10px;}
.wiki-article div.toc ul li a,.wiki-article div.article-list ul li a{padding:5px 10px;display:block;border-bottom:1px solid #DDD;}
.wiki-article div.toc ul li:last-child,.wiki-article div.article-list ul li:last-child{margin-bottom:7px;}
.wiki-article div.toc .toctitle{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999999;} .wiki-article div.toc .toctitle{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999999;}
.wiki-article a.linknotfound{color:#C87;} .wiki-article a.linknotfound{color:#C87;}
.wiki-article pre{max-width:700px;} .wiki-article pre{max-width:700px;}
......
wiki/static/wiki/bootstrap/less/wiki/wiki-bootstrap.less
...@@ -52,7 +52,30 @@ h1#article-title {font-size: 2.5em; margin-top: 0px;} ...@@ -52,7 +52,30 @@ h1#article-title {font-size: 2.5em; margin-top: 0px;}
.wiki-article div.toc ul, .wiki-article div.toc ul,
.wiki-article div.article-list ul { .wiki-article div.article-list ul {
.dropdown-menu .list-unstyled;
}
.wiki-article div.toc > ul,
.wiki-article div.article-list > ul {
.border-radius(5px);
background-color: #f6f6f6;
padding-top: 5px;
}
.wiki-article div.toc ul li ul li,
.wiki-article div.article-list ul li ul li {
padding-left: 10px;
}
.wiki-article div.toc ul li a,
.wiki-article div.article-list ul li a {
padding: 5px 10px;
display: block;
border-bottom: 1px solid #DDD;
}
.wiki-article div.toc ul li:last-child,
.wiki-article div.article-list ul li:last-child {
margin-bottom: 7px;
} }
.wiki-article div.toc .toctitle .wiki-article div.toc .toctitle
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment