Skip to content

D
django-wiki
Commit 06aa0e27 by benjaoming
Options

add codehilite CSS to enable syntax highlighting for the codehilite Markdown extension

parent e4382c89
Showing with 445 additions and 36 deletions
wiki/static/wiki/bootstrap/css/wiki-bootstrap.css
...@@ -4432,6 +4432,7 @@ textarea.wiki-control textarea { ...@@ -4432,6 +4432,7 @@ textarea.wiki-control textarea {
margin-bottom: 20px; margin-bottom: 20px;
background-color: #f5f5f5; background-color: #f5f5f5;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
float: none;
} }
.accordion-heading .icon { .accordion-heading .icon {
color: #444; color: #444;
...@@ -5948,3 +5949,281 @@ a .icon-flip-vertical:before { ...@@ -5948,3 +5949,281 @@ a .icon-flip-vertical:before {
.icon-renren:before { .icon-renren:before {
content: "\f18b"; content: "\f18b";
} }
/******************************
CODEHILITE / PYGMENTS
*******************************/
.codehilite .hll {
background-color: #ffffcc;
}
.codehilite .c {
color: #808080;
}
/* Comment */
.codehilite .err {
color: #F00000;
background-color: #f0a0a0;
}
/* Error */
.codehilite .k {
color: #008000;
font-weight: bold;
}
/* Keyword */
.codehilite .o {
color: #303030;
}
/* Operator */
.codehilite .cm {
color: #808080;
}
/* Comment.Multiline */
.codehilite .cp {
color: #507090;
}
/* Comment.Preproc */
.codehilite .c1 {
color: #808080;
}
/* Comment.Single */
.codehilite .cs {
color: #cc0000;
font-weight: bold;
}
/* Comment.Special */
.codehilite .gd {
color: #a00000;
}
/* Generic.Deleted */
.codehilite .ge {
font-style: italic;
}
/* Generic.Emph */
.codehilite .gr {
color: #ff0000;
}
/* Generic.Error */
.codehilite .gh {
color: #000080;
font-weight: bold;
}
/* Generic.Heading */
.codehilite .gi {
color: #00a000;
}
/* Generic.Inserted */
.codehilite .go {
color: #808080;
}
/* Generic.Output */
.codehilite .gp {
color: #c65d09;
font-weight: bold;
}
/* Generic.Prompt */
.codehilite .gs {
font-weight: bold;
}
/* Generic.Strong */
.codehilite .gu {
color: #800080;
font-weight: bold;
}
/* Generic.Subheading */
.codehilite .gt {
color: #0040d0;
}
/* Generic.Traceback */
.codehilite .kc {
color: #008000;
font-weight: bold;
}
/* Keyword.Constant */
.codehilite .kd {
color: #008000;
font-weight: bold;
}
/* Keyword.Declaration */
.codehilite .kn {
color: #008000;
font-weight: bold;
}
/* Keyword.Namespace */
.codehilite .kp {
color: #003080;
font-weight: bold;
}
/* Keyword.Pseudo */
.codehilite .kr {
color: #008000;
font-weight: bold;
}
/* Keyword.Reserved */
.codehilite .kt {
color: #303090;
font-weight: bold;
}
/* Keyword.Type */
.codehilite .m {
color: #6000E0;
font-weight: bold;
}
/* Literal.Number */
.codehilite .s {
background-color: #fff0f0;
}
/* Literal.String */
.codehilite .na {
color: #0000c0;
}
/* Name.Attribute */
.codehilite .nb {
color: #007020;
}
/* Name.Builtin */
.codehilite .nc {
color: #B00060;
font-weight: bold;
}
/* Name.Class */
.codehilite .no {
color: #003060;
font-weight: bold;
}
/* Name.Constant */
.codehilite .nd {
color: #505050;
font-weight: bold;
}
/* Name.Decorator */
.codehilite .ni {
color: #800000;
font-weight: bold;
}
/* Name.Entity */
.codehilite .ne {
color: #F00000;
font-weight: bold;
}
/* Name.Exception */
.codehilite .nf {
color: #0060B0;
font-weight: bold;
}
/* Name.Function */
.codehilite .nl {
color: #907000;
font-weight: bold;
}
/* Name.Label */
.codehilite .nn {
color: #0e84b5;
font-weight: bold;
}
/* Name.Namespace */
.codehilite .nt {
color: #007000;
}
/* Name.Tag */
.codehilite .nv {
color: #906030;
}
/* Name.Variable */
.codehilite .ow {
color: #000000;
font-weight: bold;
}
/* Operator.Word */
.codehilite .w {
color: #bbbbbb;
}
/* Text.Whitespace */
.codehilite .mf {
color: #6000E0;
font-weight: bold;
}
/* Literal.Number.Float */
.codehilite .mh {
color: #005080;
font-weight: bold;
}
/* Literal.Number.Hex */
.codehilite .mi {
color: #0000D0;
font-weight: bold;
}
/* Literal.Number.Integer */
.codehilite .mo {
color: #4000E0;
font-weight: bold;
}
/* Literal.Number.Oct */
.codehilite .sb {
background-color: #fff0f0;
}
/* Literal.String.Backtick */
.codehilite .sc {
color: #0040d0;
}
/* Literal.String.Char */
.codehilite .sd {
color: #d04020;
}
/* Literal.String.Doc */
.codehilite .s2 {
background-color: #fff0f0;
}
/* Literal.String.Double */
.codehilite .se {
color: #606060;
font-weight: bold;
background-color: #fff0f0;
}
/* Literal.String.Escape */
.codehilite .sh {
background-color: #fff0f0;
}
/* Literal.String.Heredoc */
.codehilite .si {
background-color: #e0e0e0;
}
/* Literal.String.Interpol */
.codehilite .sx {
color: #D02000;
background-color: #fff0f0;
}
/* Literal.String.Other */
.codehilite .sr {
color: #000000;
background-color: #fff0ff;
}
/* Literal.String.Regex */
.codehilite .s1 {
background-color: #fff0f0;
}
/* Literal.String.Single */
.codehilite .ss {
color: #a06000;
}
/* Literal.String.Symbol */
.codehilite .bp {
color: #007020;
}
/* Name.Builtin.Pseudo */
.codehilite .vc {
color: #306090;
}
/* Name.Variable.Class */
.codehilite .vg {
color: #d07000;
font-weight: bold;
}
/* Name.Variable.Global */
.codehilite .vi {
color: #3030b0;
}
/* Name.Variable.Instance */
.codehilite .il {
color: #0000D0;
font-weight: bold;
}
/* Literal.Number.Integer.Long */
wiki/static/wiki/bootstrap/css/wiki-bootstrap.min.css
...@@ -594,7 +594,7 @@ input[type=file]{float:none;width:auto;} ...@@ -594,7 +594,7 @@ input[type=file]{float:none;width:auto;}
textarea.wiki-control input,textarea.wiki-control select,textarea.wiki-control textarea{height:auto;} textarea.wiki-control input,textarea.wiki-control select,textarea.wiki-control textarea{height:auto;}
.wiki-control input.input-large,.wiki-control select.input-large,.wiki-control textarea.input-large{height:56px;padding:14px 16px;font-size:18px;border-radius:6px;} .wiki-control input.input-large,.wiki-control select.input-large,.wiki-control textarea.input-large{height:56px;padding:14px 16px;font-size:18px;border-radius:6px;}
.wiki-control input.input-small,.wiki-control select.input-small,.wiki-control textarea.input-small{height:30px;padding:5px 10px;font-size:12px;border-radius:3px;} .wiki-control input.input-small,.wiki-control select.input-small,.wiki-control textarea.input-small{height:30px;padding:5px 10px;font-size:12px;border-radius:3px;}
.form-actions{padding:19px 15px 20px;padding-left:0;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;} .form-actions{padding:19px 15px 20px;padding-left:0;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;float:none;}
.accordion-heading .icon{color:#444;font-size:75%;} .accordion-heading .icon{color:#444;font-size:75%;}
@media (min-width:980px){.wiki-modal{width:80%;margin-left:-40%;}}@media (max-width:979px){.wiki-modal{width:90%;margin-left:-45%;}}@media (max-width:767px){.wiki-modal{width:90%;margin-left:0;}}@media screen and (min-width:768px){.pull-right-block-on-responsive{float:right;} #wiki-search-form{width:140px;}}@font-face{font-family:'FontAwesome';src:url('../../font-awesome/font/fontawesome-webfont.eot?v=3.2.1');src:url('../../font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../../font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../../font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../../font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;} @media (min-width:980px){.wiki-modal{width:80%;margin-left:-40%;}}@media (max-width:979px){.wiki-modal{width:90%;margin-left:-45%;}}@media (max-width:767px){.wiki-modal{width:90%;margin-left:0;}}@media screen and (min-width:768px){.pull-right-block-on-responsive{float:right;} #wiki-search-form{width:140px;}}@font-face{font-family:'FontAwesome';src:url('../../font-awesome/font/fontawesome-webfont.eot?v=3.2.1');src:url('../../font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../../font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../../font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../../font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;} [class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;}
...@@ -999,3 +999,64 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a . ...@@ -999,3 +999,64 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-vk:before{content:"\f189";} .icon-vk:before{content:"\f189";}
.icon-weibo:before{content:"\f18a";} .icon-weibo:before{content:"\f18a";}
.icon-renren:before{content:"\f18b";} .icon-renren:before{content:"\f18b";}
.codehilite .hll{background-color:#ffffcc;}
.codehilite .c{color:#808080;}
.codehilite .err{color:#F00000;background-color:#f0a0a0;}
.codehilite .k{color:#008000;font-weight:bold;}
.codehilite .o{color:#303030;}
.codehilite .cm{color:#808080;}
.codehilite .cp{color:#507090;}
.codehilite .c1{color:#808080;}
.codehilite .cs{color:#cc0000;font-weight:bold;}
.codehilite .gd{color:#a00000;}
.codehilite .ge{font-style:italic;}
.codehilite .gr{color:#ff0000;}
.codehilite .gh{color:#000080;font-weight:bold;}
.codehilite .gi{color:#00a000;}
.codehilite .go{color:#808080;}
.codehilite .gp{color:#c65d09;font-weight:bold;}
.codehilite .gs{font-weight:bold;}
.codehilite .gu{color:#800080;font-weight:bold;}
.codehilite .gt{color:#0040d0;}
.codehilite .kc{color:#008000;font-weight:bold;}
.codehilite .kd{color:#008000;font-weight:bold;}
.codehilite .kn{color:#008000;font-weight:bold;}
.codehilite .kp{color:#003080;font-weight:bold;}
.codehilite .kr{color:#008000;font-weight:bold;}
.codehilite .kt{color:#303090;font-weight:bold;}
.codehilite .m{color:#6000E0;font-weight:bold;}
.codehilite .s{background-color:#fff0f0;}
.codehilite .na{color:#0000c0;}
.codehilite .nb{color:#007020;}
.codehilite .nc{color:#B00060;font-weight:bold;}
.codehilite .no{color:#003060;font-weight:bold;}
.codehilite .nd{color:#505050;font-weight:bold;}
.codehilite .ni{color:#800000;font-weight:bold;}
.codehilite .ne{color:#F00000;font-weight:bold;}
.codehilite .nf{color:#0060B0;font-weight:bold;}
.codehilite .nl{color:#907000;font-weight:bold;}
.codehilite .nn{color:#0e84b5;font-weight:bold;}
.codehilite .nt{color:#007000;}
.codehilite .nv{color:#906030;}
.codehilite .ow{color:#000000;font-weight:bold;}
.codehilite .w{color:#bbbbbb;}
.codehilite .mf{color:#6000E0;font-weight:bold;}
.codehilite .mh{color:#005080;font-weight:bold;}
.codehilite .mi{color:#0000D0;font-weight:bold;}
.codehilite .mo{color:#4000E0;font-weight:bold;}
.codehilite .sb{background-color:#fff0f0;}
.codehilite .sc{color:#0040d0;}
.codehilite .sd{color:#d04020;}
.codehilite .s2{background-color:#fff0f0;}
.codehilite .se{color:#606060;font-weight:bold;background-color:#fff0f0;}
.codehilite .sh{background-color:#fff0f0;}
.codehilite .si{background-color:#e0e0e0;}
.codehilite .sx{color:#D02000;background-color:#fff0f0;}
.codehilite .sr{color:#000000;background-color:#fff0ff;}
.codehilite .s1{background-color:#fff0f0;}
.codehilite .ss{color:#a06000;}
.codehilite .bp{color:#007020;}
.codehilite .vc{color:#306090;}
.codehilite .vg{color:#d07000;font-weight:bold;}
.codehilite .vi{color:#3030b0;}
.codehilite .il{color:#0000D0;font-weight:bold;}
wiki/static/wiki/bootstrap/less/wiki/codehilite.less 0 → 100644
.codehilite .hll { background-color: #ffffcc }
.codehilite .c { color: #808080 } /* Comment */
.codehilite .err { color: #F00000; background-color: #F0A0A0 } /* Error */
.codehilite .k { color: #008000; font-weight: bold } /* Keyword */
.codehilite .o { color: #303030 } /* Operator */
.codehilite .cm { color: #808080 } /* Comment.Multiline */
.codehilite .cp { color: #507090 } /* Comment.Preproc */
.codehilite .c1 { color: #808080 } /* Comment.Single */
.codehilite .cs { color: #cc0000; font-weight: bold } /* Comment.Special */
.codehilite .gd { color: #A00000 } /* Generic.Deleted */
.codehilite .ge { font-style: italic } /* Generic.Emph */
.codehilite .gr { color: #FF0000 } /* Generic.Error */
.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
.codehilite .gi { color: #00A000 } /* Generic.Inserted */
.codehilite .go { color: #808080 } /* Generic.Output */
.codehilite .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
.codehilite .gs { font-weight: bold } /* Generic.Strong */
.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
.codehilite .gt { color: #0040D0 } /* Generic.Traceback */
.codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
.codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
.codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
.codehilite .kp { color: #003080; font-weight: bold } /* Keyword.Pseudo */
.codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
.codehilite .kt { color: #303090; font-weight: bold } /* Keyword.Type */
.codehilite .m { color: #6000E0; font-weight: bold } /* Literal.Number */
.codehilite .s { background-color: #fff0f0 } /* Literal.String */
.codehilite .na { color: #0000C0 } /* Name.Attribute */
.codehilite .nb { color: #007020 } /* Name.Builtin */
.codehilite .nc { color: #B00060; font-weight: bold } /* Name.Class */
.codehilite .no { color: #003060; font-weight: bold } /* Name.Constant */
.codehilite .nd { color: #505050; font-weight: bold } /* Name.Decorator */
.codehilite .ni { color: #800000; font-weight: bold } /* Name.Entity */
.codehilite .ne { color: #F00000; font-weight: bold } /* Name.Exception */
.codehilite .nf { color: #0060B0; font-weight: bold } /* Name.Function */
.codehilite .nl { color: #907000; font-weight: bold } /* Name.Label */
.codehilite .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
.codehilite .nt { color: #007000 } /* Name.Tag */
.codehilite .nv { color: #906030 } /* Name.Variable */
.codehilite .ow { color: #000000; font-weight: bold } /* Operator.Word */
.codehilite .w { color: #bbbbbb } /* Text.Whitespace */
.codehilite .mf { color: #6000E0; font-weight: bold } /* Literal.Number.Float */
.codehilite .mh { color: #005080; font-weight: bold } /* Literal.Number.Hex */
.codehilite .mi { color: #0000D0; font-weight: bold } /* Literal.Number.Integer */
.codehilite .mo { color: #4000E0; font-weight: bold } /* Literal.Number.Oct */
.codehilite .sb { background-color: #fff0f0 } /* Literal.String.Backtick */
.codehilite .sc { color: #0040D0 } /* Literal.String.Char */
.codehilite .sd { color: #D04020 } /* Literal.String.Doc */
.codehilite .s2 { background-color: #fff0f0 } /* Literal.String.Double */
.codehilite .se { color: #606060; font-weight: bold; background-color: #fff0f0 } /* Literal.String.Escape */
.codehilite .sh { background-color: #fff0f0 } /* Literal.String.Heredoc */
.codehilite .si { background-color: #e0e0e0 } /* Literal.String.Interpol */
.codehilite .sx { color: #D02000; background-color: #fff0f0 } /* Literal.String.Other */
.codehilite .sr { color: #000000; background-color: #fff0ff } /* Literal.String.Regex */
.codehilite .s1 { background-color: #fff0f0 } /* Literal.String.Single */
.codehilite .ss { color: #A06000 } /* Literal.String.Symbol */
.codehilite .bp { color: #007020 } /* Name.Builtin.Pseudo */
.codehilite .vc { color: #306090 } /* Name.Variable.Class */
.codehilite .vg { color: #d07000; font-weight: bold } /* Name.Variable.Global */
.codehilite .vi { color: #3030B0 } /* Name.Variable.Instance */
.codehilite .il { color: #0000D0; font-weight: bold } /* Literal.Number.Integer.Long */
wiki/static/wiki/bootstrap/less/wiki/wiki-bootstrap.less
...@@ -243,6 +243,7 @@ input[type=file] {float: none; width: auto;} ...@@ -243,6 +243,7 @@ input[type=file] {float: none; width: auto;}
margin-bottom: 20px; margin-bottom: 20px;
background-color: rgb(245, 245, 245); background-color: rgb(245, 245, 245);
border-top: 1px solid rgb(229, 229, 229); border-top: 1px solid rgb(229, 229, 229);
float: none;
} }
// Assuming it's a nested icon // Assuming it's a nested icon
...@@ -290,4 +291,10 @@ input[type=file] {float: none; width: auto;} ...@@ -290,4 +291,10 @@ input[type=file] {float: none; width: auto;}
ICONS ICONS
*******************************/ *******************************/
@import "../../../font-awesome/less/font-awesome.less"; @import "../../../font-awesome/less/font-awesome.less";
\ No newline at end of file
/******************************
CODEHILITE / PYGMENTS
*******************************/
@import "codehilite.less";
wiki/templates/wiki/edit.html
...@@ -35,39 +35,41 @@ ...@@ -35,39 +35,41 @@
{% include "wiki/includes/modals.html" %} {% include "wiki/includes/modals.html" %}
<div class="form-group form-actions"> <div class="form-group form-actions row">
<a class="btn btn-default btn-large" onclick="$('#previewModal').modal('show'); document.getElementById('article_edit_form').target='previewWindow'; document.getElementById('article_edit_form').action='{% url 'wiki:preview' path=urlpath.path article_id=article.id %}'; $('#article_edit_form').submit()" href="#"> <div class="col-8 row">
<span class="icon-eye-open"></span> <div class="col-lg-2"></div>
{% trans "Preview" %} <div class="col-lg-10">
</a> <a class="btn btn-default btn-large" onclick="$('#previewModal').modal('show'); document.getElementById('article_edit_form').target='previewWindow'; document.getElementById('article_edit_form').action='{% url 'wiki:preview' path=urlpath.path article_id=article.id %}'; $('#article_edit_form').submit()" href="#">
<a class="btn btn-large btn-primary" onclick="document.getElementById('article_edit_form').target=''; document.getElementById('article_edit_form').action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'; $('#article_edit_form').submit();" href="#"> <span class="icon-eye-open"></span>
<span class="icon-ok"></span> {% trans "Preview" %}
{% trans "Save changes" %} </a>
</a> <a class="btn btn-large btn-primary" onclick="document.getElementById('article_edit_form').target=''; document.getElementById('article_edit_form').action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'; $('#article_edit_form').submit();" href="#">
<span class="icon-ok"></span>
{% if article|can_delete:user %} {% trans "Save changes" %}
<a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="pull-right btn"> </a>
<span class="icon-trash"></span>
{% trans "Delete article" %}
</a>
{% endif %}
</div> </div>
<div class="modal hide wiki-modal" id="previewModal"> {% if article|can_delete:user %}
<div class="modal-body"> <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="pull-right btn">
<iframe name="previewWindow" frameborder="0"></iframe> <span class="icon-trash"></span>
</div> {% trans "Delete article" %}
<div class="modal-footer"> </a>
<a href="#" class="btn btn-default btn-large" data-dismiss="modal"> {% endif %}
<span class="icon-circle-arrow-left"></span> </div>
{% trans "Back to editor" %} </div>
</a> <div class="modal hide wiki-modal" id="previewModal">
<a class="btn btn-large btn-primary" onclick="document.getElementById('article_edit_form').target=''; document.getElementById('article_edit_form').action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'; document.getElementById('article_edit_form').submit();" href="#"> <div class="modal-body">
<span class="icon-ok"></span> <iframe name="previewWindow" frameborder="0"></iframe>
{% trans "Save changes" %} </div>
</a> <div class="modal-footer">
</div> <a href="#" class="btn btn-default btn-large" data-dismiss="modal">
</div> <span class="icon-circle-arrow-left"></span>
{% trans "Back to editor" %}
</a>
<a class="btn btn-large btn-primary" onclick="document.getElementById('article_edit_form').target=''; document.getElementById('article_edit_form').action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'; document.getElementById('article_edit_form').submit();" href="#">
<span class="icon-ok"></span>
{% trans "Save changes" %}
</a>
</div>
</div>
{% endblock %} {% endblock %}
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