Permalink
Browse files

Merge branch 'codemirror' of git://github.com/nbeloglazov/4clojure in…

…to develop
  • Loading branch information...
2 parents 5b83f3f + cea5b50 commit b9b81332f6552e95dbfe543745e1ae9a5efd15f8 @Raynes Raynes committed Sep 7, 2012
Showing with 683 additions and 3,253 deletions.
  1. +173 −0 resources/public/css/codemirror.css
  2. +0 −226 resources/public/css/shCore.css
  3. +0 −117 resources/public/css/shThemeDefault.css
  4. +33 −8 resources/public/css/style.css
  5. +81 −0 resources/public/css/theme/ambiance.css
  6. +25 −0 resources/public/css/theme/blackboard.css
  7. +18 −0 resources/public/css/theme/cobalt.css
  8. +25 −0 resources/public/css/theme/eclipse.css
  9. +10 −0 resources/public/css/theme/elegant.css
  10. +21 −0 resources/public/css/theme/erlang-dark.css
  11. +44 −0 resources/public/css/theme/lesser-dark.css
  12. +28 −0 resources/public/css/theme/monokai.css
  13. +9 −0 resources/public/css/theme/neat.css
  14. +21 −0 resources/public/css/theme/night.css
  15. +21 −0 resources/public/css/theme/rubyblue.css
  16. +27 −0 resources/public/css/theme/vibrant-ink.css
  17. +46 −0 resources/public/css/theme/xq-dark.css
  18. +16 −21 resources/public/script/codebox.js
  19. +19 −0 resources/public/script/foreclojure.js
  20. +0 −1 resources/public/vendor/script/ace/ace.js
  21. +0 −1 resources/public/vendor/script/ace/mode-clojure.js
  22. +1 −0 resources/public/vendor/script/codemirror-clojure-compressed.js
  23. +0 −130 resources/public/vendor/script/shAutoloader.js
  24. +0 −189 resources/public/vendor/script/shBrushClojure.js
  25. +0 −1,721 resources/public/vendor/script/shCore.js
  26. +0 −157 resources/public/vendor/script/shLegacy.js
  27. +0 −651 resources/public/vendor/script/xregexp.js
  28. +7 −9 src/foreclojure/problems.clj
  29. +37 −9 src/foreclojure/settings.clj
  30. +1 −2 src/foreclojure/social.clj
  31. +2 −3 src/foreclojure/static.clj
  32. +7 −7 src/foreclojure/template.clj
  33. +11 −1 src/foreclojure/utils.clj
@@ -0,0 +1,173 @@
+.CodeMirror {
+ line-height: 1em;
+ font-family: monospace;
+
+ /* Necessary so the scrollbar can be absolutely positioned within the wrapper on Lion. */
+ position: relative;
+ /* This prevents unwanted scrollbars from showing up on the body and wrapper in IE. */
+ overflow: hidden;
+}
+
+.CodeMirror-scroll {
+ overflow: auto;
+ height: 300px;
+ /* This is needed to prevent an IE[67] bug where the scrolled content
+ is visible outside of the scrolling box. */
+ position: relative;
+ outline: none;
+}
+
+/* Vertical scrollbar */
+.CodeMirror-scrollbar {
+ position: absolute;
+ right: 0; top: 0;
+ overflow-x: hidden;
+ overflow-y: scroll;
+ z-index: 5;
+}
+.CodeMirror-scrollbar-inner {
+ /* This needs to have a nonzero width in order for the scrollbar to appear
+ in Firefox and IE9. */
+ width: 1px;
+}
+.CodeMirror-scrollbar.cm-sb-overlap {
+ /* Ensure that the scrollbar appears in Lion, and that it overlaps the content
+ rather than sitting to the right of it. */
+ position: absolute;
+ z-index: 1;
+ float: none;
+ right: 0;
+ min-width: 12px;
+}
+.CodeMirror-scrollbar.cm-sb-nonoverlap {
+ min-width: 12px;
+}
+.CodeMirror-scrollbar.cm-sb-ie7 {
+ min-width: 18px;
+}
+
+.CodeMirror-gutter {
+ position: absolute; left: 0; top: 0;
+ z-index: 10;
+ background-color: #f7f7f7;
+ border-right: 1px solid #eee;
+ min-width: 2em;
+ height: 100%;
+}
+.CodeMirror-gutter-text {
+ color: #aaa;
+ text-align: right;
+ padding: .4em .2em .4em .4em;
+ white-space: pre !important;
+ cursor: default;
+}
+.CodeMirror-lines {
+ padding: .4em;
+ white-space: pre;
+ cursor: text;
+}
+
+.CodeMirror pre {
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ -o-border-radius: 0;
+ border-radius: 0;
+ border-width: 0; margin: 0; padding: 0; background: transparent;
+ font-family: inherit;
+ font-size: inherit;
+ padding: 0; margin: 0;
+ white-space: pre;
+ word-wrap: normal;
+ line-height: inherit;
+ color: inherit;
+}
+
+.CodeMirror-wrap pre {
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ word-break: normal;
+}
+.CodeMirror-wrap .CodeMirror-scroll {
+ overflow-x: hidden;
+}
+
+.CodeMirror textarea {
+ outline: none !important;
+}
+
+.CodeMirror pre.CodeMirror-cursor {
+ z-index: 10;
+ position: absolute;
+ visibility: hidden;
+ border-left: 1px solid black;
+ border-right: none;
+ width: 0;
+}
+.cm-keymap-fat-cursor pre.CodeMirror-cursor {
+ width: auto;
+ border: 0;
+ background: transparent;
+ background: rgba(0, 200, 0, .4);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
+}
+/* Kludge to turn off filter in ie9+, which also accepts rgba */
+.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id) {
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
+.CodeMirror-focused pre.CodeMirror-cursor {
+ visibility: visible;
+}
+
+div.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }
+
+.CodeMirror-searching {
+ background: #ffa;
+ background: rgba(255, 255, 0, .4);
+}
+
+/* Default theme */
+
+.cm-s-default span.cm-keyword {color: #708;}
+.cm-s-default span.cm-atom {color: #219;}
+.cm-s-default span.cm-number {color: #164;}
+.cm-s-default span.cm-def {color: #00f;}
+.cm-s-default span.cm-variable {color: black;}
+.cm-s-default span.cm-variable-2 {color: #05a;}
+.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-property {color: black;}
+.cm-s-default span.cm-operator {color: black;}
+.cm-s-default span.cm-comment {color: #a50;}
+.cm-s-default span.cm-string {color: #a11;}
+.cm-s-default span.cm-string-2 {color: #f50;}
+.cm-s-default span.cm-meta {color: #555;}
+.cm-s-default span.cm-error {color: #f00;}
+.cm-s-default span.cm-qualifier {color: #555;}
+.cm-s-default span.cm-builtin {color: #30a;}
+.cm-s-default span.cm-bracket {color: #cc7;}
+.cm-s-default span.cm-tag {color: #170;}
+.cm-s-default span.cm-attribute {color: #00c;}
+.cm-s-default span.cm-header {color: blue;}
+.cm-s-default span.cm-quote {color: #090;}
+.cm-s-default span.cm-hr {color: #999;}
+.cm-s-default span.cm-link {color: #00c;}
+
+span.cm-header, span.cm-strong {font-weight: bold;}
+span.cm-em {font-style: italic;}
+span.cm-emstrong {font-style: italic; font-weight: bold;}
+span.cm-link {text-decoration: underline;}
+
+span.cm-invalidchar {color: #f00;}
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+
+@media print {
+
+ /* Hide the cursor when printing */
+ .CodeMirror pre.CodeMirror-cursor {
+ visibility: hidden;
+ }
+
+}
Oops, something went wrong.

0 comments on commit b9b8133

Please sign in to comment.