diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2012-03-02 22:00:20 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2012-03-02 22:00:20 +0100 |
| commit | ce5d2d86850be0496467a16333c0646d71649f7c (patch) | |
| tree | 56e4eed0c777c6f338b1dfaef4a1daabdd1ccce4 /src/static/css/iframe_editor.css | |
| parent | 6cd391d3fb33f5c59fd0d1deaaa18c1034e0bd81 (diff) | |
| parent | 6fd73ecfda27fd6639c30a4c05c6149d66f669ee (diff) | |
| download | etherpad-lite-ce5d2d86850be0496467a16333c0646d71649f7c.zip | |
Merge branch 'pita'
Resolved conflicts:
.gitignore
src/static/js/ace.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/domline.js
src/static/pad.html
src/static/timeslider.html
Ignored conflicts (please merge manually later):
node/server.js
src/node/utils/Minify.js
Diffstat (limited to 'src/static/css/iframe_editor.css')
| -rw-r--r-- | src/static/css/iframe_editor.css | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index 6a483c07..d2d2f977 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -170,34 +170,3 @@ p { } #overlaysdiv { position: absolute; left: -1000px; top: -1000px; } - -/* ---------- Used by JavaScript Lexer ---------- */ -.syntax .c { color: #bd3f00; font-style: italic } /* Comment */ -.syntax .o { font-weight: bold; } /* Operator */ -.syntax .p { font-weight: bold; } /* Punctuation */ -.syntax .k { color: blue; } /* Keyword */ -.syntax .kc { color: purple } /* Keyword.Constant */ -.syntax .nx { } /* Name.Other */ -.syntax .mf { color: purple } /* Literal.Number.Float */ -.syntax .mh { color: purple } /* Literal.Number.Hex */ -.syntax .mi { color: purple } /* Literal.Number.Integer */ -.syntax .sr { color: purple } /* Literal.String.Regex */ -.syntax .s2 { color: purple } /* Literal.String.Double */ -.syntax .s1 { color: purple } /* Literal.String.Single */ -.syntax .sd { color: purple } /* Literal.String.Doc */ -.syntax .cs { color: #00aa33; font-weight: bold; font-style: italic } /* Comment.Special */ -.syntax .err { color: #cc0000; font-weight: bold; text-decoration: underline; } /* Error */ - -/* css */ -.syntax .nt { font-weight: bold; } /* tag */ -.syntax .nc { color: #336; } /* class */ -.syntax .nf { color: #336; } /* id */ -.syntax .nd { color: #999; } /* :foo */ -.syntax .m { color: purple } /* number */ -.syntax .nb { color: purple } /* built-in */ -.syntax .cp { color: #bd3f00; } /* !important */ - -.syntax .flash { background-color: #adf !important; } -.syntax .flashbad { background-color: #f55 !important; } - - |