##// END OF EJS Templates
checking in css
Nicholas Bollweg (Nick) -
Show More
@@ -616,11 +616,15 b' define(['
616 var modename = (typeof mode == "string") ? mode :
616 var modename = (typeof mode == "string") ? mode :
617 mode.mode || mode.name;
617 mode.mode || mode.name;
618
618
619 // simplest, cheapest check by mode name: mode may also have config
619 if (CodeMirror.modes.hasOwnProperty(modename)) {
620 if (CodeMirror.modes.hasOwnProperty(modename)) {
620 callback(mode);
621 // return the full mode object, if it has a name
622 callback(mode.name ? mode : modename);
621 return;
623 return;
622 }
624 }
623
625
626 // *somehow* get back a CM.modeInfo-like object that has .mode and
627 // .mime
624 var info = (mode && mode.mode && mode.mime && mode) ||
628 var info = (mode && mode.mode && mode.mime && mode) ||
625 CodeMirror.findModeByName(modename) ||
629 CodeMirror.findModeByName(modename) ||
626 CodeMirror.findModeByExtension(modename.split(".").slice(-1)) ||
630 CodeMirror.findModeByExtension(modename.split(".").slice(-1)) ||
@@ -630,7 +634,11 b' define(['
630 require([
634 require([
631 // might want to use CodeMirror.modeURL here
635 // might want to use CodeMirror.modeURL here
632 ['codemirror/mode', info.mode, info.mode].join('/'),
636 ['codemirror/mode', info.mode, info.mode].join('/'),
633 ], function() { callback(info.mime); }, errback
637 ], function() {
638 // return the original mode, as from a kernelspec on first load
639 // or the mimetype, as for most highlighting
640 callback(mode.name ? mode : info.mime);
641 }, errback
634 );
642 );
635 };
643 };
636
644
@@ -563,145 +563,103 b' Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiac'
563 Adapted from GitHub theme
563 Adapted from GitHub theme
564
564
565 */
565 */
566 pre code {
566 .highlight-base {
567 display: block;
567 color: #000000;
568 padding: 0.5em;
568 }
569 }
569 .highlight-variable {
570 .highlight-base,
570 color: #000000;
571 pre code,
571 }
572 pre .subst,
572 .highlight-variable-2 {
573 pre .tag .title,
573 color: #1a1a1a;
574 pre .lisp .title,
574 }
575 pre .clojure .built_in,
575 .highlight-variable-3 {
576 pre .nginx .title {
576 color: #333333;
577 color: black;
578 }
577 }
579 .highlight-string,
578 .highlight-string {
580 pre .string,
581 pre .constant,
582 pre .parent,
583 pre .tag .value,
584 pre .rules .value,
585 pre .rules .value .number,
586 pre .preprocessor,
587 pre .ruby .symbol,
588 pre .ruby .symbol .string,
589 pre .aggregate,
590 pre .template_tag,
591 pre .django .variable,
592 pre .smalltalk .class,
593 pre .addition,
594 pre .flow,
595 pre .stream,
596 pre .bash .variable,
597 pre .apache .tag,
598 pre .apache .cbracket,
599 pre .tex .command,
600 pre .tex .special,
601 pre .erlang_repl .function_or_atom,
602 pre .markdown .header {
603 color: #BA2121;
579 color: #BA2121;
604 }
580 }
605 .highlight-comment,
581 .highlight-comment {
606 pre .comment,
607 pre .annotation,
608 pre .template_comment,
609 pre .diff .header,
610 pre .chunk,
611 pre .markdown .blockquote {
612 color: #408080;
582 color: #408080;
613 font-style: italic;
583 font-style: italic;
614 }
584 }
615 .highlight-number,
585 .highlight-number {
616 pre .number,
617 pre .date,
618 pre .regexp,
619 pre .literal,
620 pre .smalltalk .symbol,
621 pre .smalltalk .char,
622 pre .go .constant,
623 pre .change,
624 pre .markdown .bullet,
625 pre .markdown .link_url {
626 color: #080;
586 color: #080;
627 }
587 }
628 pre .label,
588 .highlight-atom {
629 pre .javadoc,
589 color: #88F;
630 pre .ruby .string,
590 }
631 pre .decorator,
591 .highlight-keyword {
632 pre .filter .argument,
633 pre .localvars,
634 pre .array,
635 pre .attr_selector,
636 pre .important,
637 pre .pseudo,
638 pre .pi,
639 pre .doctype,
640 pre .deletion,
641 pre .envvar,
642 pre .shebang,
643 pre .apache .sqbracket,
644 pre .nginx .built_in,
645 pre .tex .formula,
646 pre .erlang_repl .reserved,
647 pre .prompt,
648 pre .markdown .link_label,
649 pre .vhdl .attribute,
650 pre .clojure .attribute,
651 pre .coffeescript .property {
652 color: #8888ff;
653 }
654 .highlight-keyword,
655 pre .keyword,
656 pre .id,
657 pre .phpdoc,
658 pre .aggregate,
659 pre .css .tag,
660 pre .javadoctag,
661 pre .phpdoc,
662 pre .yardoctag,
663 pre .smalltalk .class,
664 pre .winutils,
665 pre .bash .variable,
666 pre .apache .tag,
667 pre .go .typename,
668 pre .tex .command,
669 pre .markdown .strong,
670 pre .request,
671 pre .status {
672 color: #008000;
592 color: #008000;
673 font-weight: bold;
593 font-weight: bold;
674 }
594 }
675 .highlight-builtin,
595 .highlight-builtin {
676 pre .built_in {
677 color: #008000;
596 color: #008000;
678 }
597 }
679 pre .markdown .emphasis {
598 .highlight-error {
680 font-style: italic;
599 color: #f00;
681 }
600 }
682 pre .nginx .built_in {
601 .highlight-operator {
683 font-weight: normal;
602 color: #AA22FF;
603 font-weight: bold;
604 }
605 .highlight-meta {
606 color: #AA22FF;
684 }
607 }
685 pre .coffeescript .javascript,
608 /* previously not defined, copying from default codemirror */
686 pre .javascript .xml,
609 .highlight-def {
687 pre .tex .formula,
610 color: #00f;
688 pre .xml .javascript,
689 pre .xml .vbscript,
690 pre .xml .css,
691 pre .xml .cdata {
692 opacity: 0.5;
693 }
611 }
694 /* apply the same style to codemirror */
612 .highlight-string-2 {
695 .cm-s-ipython span.cm-variable {
613 color: #f50;
696 color: black;
614 }
615 .highlight-qualifier {
616 color: #555;
617 }
618 .highlight-bracket {
619 color: #997;
620 }
621 .highlight-tag {
622 color: #170;
697 }
623 }
624 .highlight-attribute {
625 color: #00c;
626 }
627 .highlight-header {
628 color: blue;
629 }
630 .highlight-quote {
631 color: #090;
632 }
633 .highlight-link {
634 color: #00c;
635 }
636 /* apply the same style to codemirror */
698 .cm-s-ipython span.cm-keyword {
637 .cm-s-ipython span.cm-keyword {
699 color: #008000;
638 color: #008000;
700 font-weight: bold;
639 font-weight: bold;
701 }
640 }
641 .cm-s-ipython span.cm-atom {
642 color: #88F;
643 }
702 .cm-s-ipython span.cm-number {
644 .cm-s-ipython span.cm-number {
703 color: #080;
645 color: #080;
704 }
646 }
647 .cm-s-ipython span.cm-def {
648 color: #00f;
649 }
650 .cm-s-ipython span.cm-variable {
651 color: #000000;
652 }
653 .cm-s-ipython span.cm-operator {
654 color: #AA22FF;
655 font-weight: bold;
656 }
657 .cm-s-ipython span.cm-variable-2 {
658 color: #1a1a1a;
659 }
660 .cm-s-ipython span.cm-variable-3 {
661 color: #333333;
662 }
705 .cm-s-ipython span.cm-comment {
663 .cm-s-ipython span.cm-comment {
706 color: #408080;
664 color: #408080;
707 font-style: italic;
665 font-style: italic;
@@ -709,18 +667,38 b' pre .xml .cdata {'
709 .cm-s-ipython span.cm-string {
667 .cm-s-ipython span.cm-string {
710 color: #BA2121;
668 color: #BA2121;
711 }
669 }
670 .cm-s-ipython span.cm-string-2 {
671 color: #f50;
672 }
673 .cm-s-ipython span.cm-meta {
674 color: #AA22FF;
675 }
676 .cm-s-ipython span.cm-qualifier {
677 color: #555;
678 }
712 .cm-s-ipython span.cm-builtin {
679 .cm-s-ipython span.cm-builtin {
713 color: #008000;
680 color: #008000;
714 }
681 }
715 .cm-s-ipython span.cm-error {
682 .cm-s-ipython span.cm-bracket {
716 color: #f00;
683 color: #997;
717 }
684 }
718 .cm-s-ipython span.cm-operator {
685 .cm-s-ipython span.cm-tag {
719 color: #AA22FF;
686 color: #170;
720 font-weight: bold;
721 }
687 }
722 .cm-s-ipython span.cm-meta {
688 .cm-s-ipython span.cm-attribute {
723 color: #AA22FF;
689 color: #00c;
690 }
691 .cm-s-ipython span.cm-header {
692 color: blue;
693 }
694 .cm-s-ipython span.cm-quote {
695 color: #090;
696 }
697 .cm-s-ipython span.cm-link {
698 color: #00c;
699 }
700 .cm-s-ipython span.cm-error {
701 color: #f00;
724 }
702 }
725 .cm-s-ipython span.cm-tab {
703 .cm-s-ipython span.cm-tab {
726 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
704 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
@@ -8469,145 +8469,103 b' Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiac'
8469 Adapted from GitHub theme
8469 Adapted from GitHub theme
8470
8470
8471 */
8471 */
8472 pre code {
8472 .highlight-base {
8473 display: block;
8473 color: #000000;
8474 padding: 0.5em;
8474 }
8475 }
8475 .highlight-variable {
8476 .highlight-base,
8476 color: #000000;
8477 pre code,
8477 }
8478 pre .subst,
8478 .highlight-variable-2 {
8479 pre .tag .title,
8479 color: #1a1a1a;
8480 pre .lisp .title,
8480 }
8481 pre .clojure .built_in,
8481 .highlight-variable-3 {
8482 pre .nginx .title {
8482 color: #333333;
8483 color: black;
8484 }
8483 }
8485 .highlight-string,
8484 .highlight-string {
8486 pre .string,
8487 pre .constant,
8488 pre .parent,
8489 pre .tag .value,
8490 pre .rules .value,
8491 pre .rules .value .number,
8492 pre .preprocessor,
8493 pre .ruby .symbol,
8494 pre .ruby .symbol .string,
8495 pre .aggregate,
8496 pre .template_tag,
8497 pre .django .variable,
8498 pre .smalltalk .class,
8499 pre .addition,
8500 pre .flow,
8501 pre .stream,
8502 pre .bash .variable,
8503 pre .apache .tag,
8504 pre .apache .cbracket,
8505 pre .tex .command,
8506 pre .tex .special,
8507 pre .erlang_repl .function_or_atom,
8508 pre .markdown .header {
8509 color: #BA2121;
8485 color: #BA2121;
8510 }
8486 }
8511 .highlight-comment,
8487 .highlight-comment {
8512 pre .comment,
8513 pre .annotation,
8514 pre .template_comment,
8515 pre .diff .header,
8516 pre .chunk,
8517 pre .markdown .blockquote {
8518 color: #408080;
8488 color: #408080;
8519 font-style: italic;
8489 font-style: italic;
8520 }
8490 }
8521 .highlight-number,
8491 .highlight-number {
8522 pre .number,
8523 pre .date,
8524 pre .regexp,
8525 pre .literal,
8526 pre .smalltalk .symbol,
8527 pre .smalltalk .char,
8528 pre .go .constant,
8529 pre .change,
8530 pre .markdown .bullet,
8531 pre .markdown .link_url {
8532 color: #080;
8492 color: #080;
8533 }
8493 }
8534 pre .label,
8494 .highlight-atom {
8535 pre .javadoc,
8495 color: #88F;
8536 pre .ruby .string,
8496 }
8537 pre .decorator,
8497 .highlight-keyword {
8538 pre .filter .argument,
8539 pre .localvars,
8540 pre .array,
8541 pre .attr_selector,
8542 pre .important,
8543 pre .pseudo,
8544 pre .pi,
8545 pre .doctype,
8546 pre .deletion,
8547 pre .envvar,
8548 pre .shebang,
8549 pre .apache .sqbracket,
8550 pre .nginx .built_in,
8551 pre .tex .formula,
8552 pre .erlang_repl .reserved,
8553 pre .prompt,
8554 pre .markdown .link_label,
8555 pre .vhdl .attribute,
8556 pre .clojure .attribute,
8557 pre .coffeescript .property {
8558 color: #8888ff;
8559 }
8560 .highlight-keyword,
8561 pre .keyword,
8562 pre .id,
8563 pre .phpdoc,
8564 pre .aggregate,
8565 pre .css .tag,
8566 pre .javadoctag,
8567 pre .phpdoc,
8568 pre .yardoctag,
8569 pre .smalltalk .class,
8570 pre .winutils,
8571 pre .bash .variable,
8572 pre .apache .tag,
8573 pre .go .typename,
8574 pre .tex .command,
8575 pre .markdown .strong,
8576 pre .request,
8577 pre .status {
8578 color: #008000;
8498 color: #008000;
8579 font-weight: bold;
8499 font-weight: bold;
8580 }
8500 }
8581 .highlight-builtin,
8501 .highlight-builtin {
8582 pre .built_in {
8583 color: #008000;
8502 color: #008000;
8584 }
8503 }
8585 pre .markdown .emphasis {
8504 .highlight-error {
8586 font-style: italic;
8505 color: #f00;
8587 }
8506 }
8588 pre .nginx .built_in {
8507 .highlight-operator {
8589 font-weight: normal;
8508 color: #AA22FF;
8509 font-weight: bold;
8590 }
8510 }
8591 pre .coffeescript .javascript,
8511 .highlight-meta {
8592 pre .javascript .xml,
8512 color: #AA22FF;
8593 pre .tex .formula,
8594 pre .xml .javascript,
8595 pre .xml .vbscript,
8596 pre .xml .css,
8597 pre .xml .cdata {
8598 opacity: 0.5;
8599 }
8513 }
8600 /* apply the same style to codemirror */
8514 /* previously not defined, copying from default codemirror */
8601 .cm-s-ipython span.cm-variable {
8515 .highlight-def {
8602 color: black;
8516 color: #00f;
8517 }
8518 .highlight-string-2 {
8519 color: #f50;
8520 }
8521 .highlight-qualifier {
8522 color: #555;
8523 }
8524 .highlight-bracket {
8525 color: #997;
8526 }
8527 .highlight-tag {
8528 color: #170;
8603 }
8529 }
8530 .highlight-attribute {
8531 color: #00c;
8532 }
8533 .highlight-header {
8534 color: blue;
8535 }
8536 .highlight-quote {
8537 color: #090;
8538 }
8539 .highlight-link {
8540 color: #00c;
8541 }
8542 /* apply the same style to codemirror */
8604 .cm-s-ipython span.cm-keyword {
8543 .cm-s-ipython span.cm-keyword {
8605 color: #008000;
8544 color: #008000;
8606 font-weight: bold;
8545 font-weight: bold;
8607 }
8546 }
8547 .cm-s-ipython span.cm-atom {
8548 color: #88F;
8549 }
8608 .cm-s-ipython span.cm-number {
8550 .cm-s-ipython span.cm-number {
8609 color: #080;
8551 color: #080;
8610 }
8552 }
8553 .cm-s-ipython span.cm-def {
8554 color: #00f;
8555 }
8556 .cm-s-ipython span.cm-variable {
8557 color: #000000;
8558 }
8559 .cm-s-ipython span.cm-operator {
8560 color: #AA22FF;
8561 font-weight: bold;
8562 }
8563 .cm-s-ipython span.cm-variable-2 {
8564 color: #1a1a1a;
8565 }
8566 .cm-s-ipython span.cm-variable-3 {
8567 color: #333333;
8568 }
8611 .cm-s-ipython span.cm-comment {
8569 .cm-s-ipython span.cm-comment {
8612 color: #408080;
8570 color: #408080;
8613 font-style: italic;
8571 font-style: italic;
@@ -8615,18 +8573,38 b' pre .xml .cdata {'
8615 .cm-s-ipython span.cm-string {
8573 .cm-s-ipython span.cm-string {
8616 color: #BA2121;
8574 color: #BA2121;
8617 }
8575 }
8576 .cm-s-ipython span.cm-string-2 {
8577 color: #f50;
8578 }
8579 .cm-s-ipython span.cm-meta {
8580 color: #AA22FF;
8581 }
8582 .cm-s-ipython span.cm-qualifier {
8583 color: #555;
8584 }
8618 .cm-s-ipython span.cm-builtin {
8585 .cm-s-ipython span.cm-builtin {
8619 color: #008000;
8586 color: #008000;
8620 }
8587 }
8621 .cm-s-ipython span.cm-error {
8588 .cm-s-ipython span.cm-bracket {
8622 color: #f00;
8589 color: #997;
8623 }
8590 }
8624 .cm-s-ipython span.cm-operator {
8591 .cm-s-ipython span.cm-tag {
8625 color: #AA22FF;
8592 color: #170;
8626 font-weight: bold;
8627 }
8593 }
8628 .cm-s-ipython span.cm-meta {
8594 .cm-s-ipython span.cm-attribute {
8629 color: #AA22FF;
8595 color: #00c;
8596 }
8597 .cm-s-ipython span.cm-header {
8598 color: blue;
8599 }
8600 .cm-s-ipython span.cm-quote {
8601 color: #090;
8602 }
8603 .cm-s-ipython span.cm-link {
8604 color: #00c;
8605 }
8606 .cm-s-ipython span.cm-error {
8607 color: #f00;
8630 }
8608 }
8631 .cm-s-ipython span.cm-tab {
8609 .cm-s-ipython span.cm-tab {
8632 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
8610 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
General Comments 0
You need to be logged in to leave comments. Login now