[dev-random] resolved conflicts

1 files changed, 69 insertions, 0 deletions

diff --git a/bootlex/static/pastie.css b/bootlex/static/pastie.css
new file mode 100644
index 0000000..783e793
--- /dev/null
+++ b/bootlex/static/pastie.css
@@ -0,0 +1,69 @@
+.codehilite { background-color: #ffffcc }
+.codehilite .c { color: #586E75 } /* Comment */
+.codehilite .err { color: #93A1A1 } /* Error */
+.codehilite .g { color: #93A1A1 } /* Generic */
+.codehilite .k { color: #859900 } /* Keyword */
+.codehilite .l { color: #93A1A1 } /* Literal */
+.codehilite .n { color: #93A1A1 } /* Name */
+.codehilite .o { color: #859900 } /* Operator */
+.codehilite .x { color: #CB4B16 } /* Other */
+.codehilite .p { color: #93A1A1 } /* Punctuation */
+.codehilite .cm { color: #586E75 } /* Comment.Multiline */
+.codehilite .cp { color: #859900 } /* Comment.Preproc */
+.codehilite .c1 { color: #586E75 } /* Comment.Single */
+.codehilite .cs { color: #859900 } /* Comment.Special */
+.codehilite .gd { color: #2AA198 } /* Generic.Deleted */
+.codehilite .ge { color: #93A1A1; font-style: italic } /* Generic.Emph */
+.codehilite .gr { color: #DC322F } /* Generic.Error */
+.codehilite .gh { color: #CB4B16 } /* Generic.Heading */
+.codehilite .gi { color: #859900 } /* Generic.Inserted */
+.codehilite .go { color: #93A1A1 } /* Generic.Output */
+.codehilite .gp { color: #93A1A1 } /* Generic.Prompt */
+.codehilite .gs { color: #93A1A1; font-weight: bold } /* Generic.Strong */
+.codehilite .gu { color: #CB4B16 } /* Generic.Subheading */
+.codehilite .gt { color: #93A1A1 } /* Generic.Traceback */
+.codehilite .kc { color: #CB4B16 } /* Keyword.Constant */
+.codehilite .kd { color: #268BD2 } /* Keyword.Declaration */
+.codehilite .kn { color: #859900 } /* Keyword.Namespace */
+.codehilite .kp { color: #859900 } /* Keyword.Pseudo */
+.codehilite .kr { color: #268BD2 } /* Keyword.Reserved */
+.codehilite .kt { color: #DC322F } /* Keyword.Type */
+.codehilite .ld { color: #93A1A1 } /* Literal.Date */
+.codehilite .m { color: #2AA198 } /* Literal.Number */
+.codehilite .s { color: #2AA198 } /* Literal.String */
+.codehilite .na { color: #93A1A1 } /* Name.Attribute */
+.codehilite .nb { color: #B58900 } /* Name.Builtin */
+.codehilite .nc { color: #268BD2 } /* Name.Class */
+.codehilite .no { color: #CB4B16 } /* Name.Constant */
+.codehilite .nd { color: #268BD2 } /* Name.Decorator */
+.codehilite .ni { color: #CB4B16 } /* Name.Entity */
+.codehilite .ne { color: #CB4B16 } /* Name.Exception */
+.codehilite .nf { color: #268BD2 } /* Name.Function */
+.codehilite .nl { color: #93A1A1 } /* Name.Label */
+.codehilite .nn { color: #93A1A1 } /* Name.Namespace */
+.codehilite .nx { color: #93A1A1 } /* Name.Other */
+.codehilite .py { color: #93A1A1 } /* Name.Property */
+.codehilite .nt { color: #268BD2 } /* Name.Tag */
+.codehilite .nv { color: #268BD2 } /* Name.Variable */
+.codehilite .ow { color: #859900 } /* Operator.Word */
+.codehilite .w { color: #93A1A1 } /* Text.Whitespace */
+.codehilite .mf { color: #2AA198 } /* Literal.Number.Float */
+.codehilite .mh { color: #2AA198 } /* Literal.Number.Hex */
+.codehilite .mi { color: #2AA198 } /* Literal.Number.Integer */
+.codehilite .mo { color: #2AA198 } /* Literal.Number.Oct */
+.codehilite .sb { color: #586E75 } /* Literal.String.Backtick */
+.codehilite .sc { color: #2AA198 } /* Literal.String.Char */
+.codehilite .sd { color: #93A1A1 } /* Literal.String.Doc */
+.codehilite .s2 { color: #2AA198 } /* Literal.String.Double */
+.codehilite .se { color: #CB4B16 } /* Literal.String.Escape */
+.codehilite .sh { color: #93A1A1 } /* Literal.String.Heredoc */
+.codehilite .si { color: #2AA198 } /* Literal.String.Interpol */
+.codehilite .sx { color: #2AA198 } /* Literal.String.Other */
+.codehilite .sr { color: #DC322F } /* Literal.String.Regex */
+.codehilite .s1 { color: #2AA198 } /* Literal.String.Single */
+.codehilite .ss { color: #2AA198 } /* Literal.String.Symbol */
+.codehilite .bp { color: #268BD2 } /* Name.Builtin.Pseudo */
+.codehilite .vc { color: #268BD2 } /* Name.Variable.Class */
+.codehilite .vg { color: #268BD2 } /* Name.Variable.Global */
+.codehilite .vi { color: #268BD2 } /* Name.Variable.Instance */
+.codehilite .il { color: #2AA198 } /* Literal.Number.Integer.Long */
\ No newline at end of file