Skip to content

Commit d3ced43

Browse files
committed
updated to 1.0.0
1 parent 7feff9c commit d3ced43

File tree

4 files changed

+10911
-9817
lines changed

4 files changed

+10911
-9817
lines changed

build/css/codemirror.css

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
/* Set height, width, borders, and global font properties here */
44
font-family: monospace;
55
height: 300px;
6-
color: black; }
6+
color: black;
7+
direction: ltr; }
78

89
/* PADDING */
910
.CodeMirror-lines {
@@ -49,12 +50,18 @@
4950

5051
.cm-fat-cursor .CodeMirror-cursor {
5152
width: auto;
52-
border: 0;
53+
border: 0 !important;
5354
background: #7e7; }
5455

5556
.cm-fat-cursor div.CodeMirror-cursors {
5657
z-index: 1; }
5758

59+
.cm-fat-cursor-mark {
60+
background-color: rgba(20, 255, 20, 0.5);
61+
-webkit-animation: blink 1.06s steps(1) infinite;
62+
-moz-animation: blink 1.06s steps(1) infinite;
63+
animation: blink 1.06s steps(1) infinite; }
64+
5865
.cm-animate-fat-cursor {
5966
width: auto;
6067
border: 0;
@@ -86,8 +93,18 @@
8693
display: inline-block;
8794
text-decoration: inherit; }
8895

96+
.CodeMirror-rulers {
97+
position: absolute;
98+
left: 0;
99+
right: 0;
100+
top: -50px;
101+
bottom: -20px;
102+
overflow: hidden; }
103+
89104
.CodeMirror-ruler {
90105
border-left: 1px solid #ccc;
106+
top: 0;
107+
bottom: 0;
91108
position: absolute; }
92109

93110
/* DEFAULT THEME */
@@ -130,7 +147,7 @@
130147
.cm-s-default .cm-variable-2 {
131148
color: #05a; }
132149

133-
.cm-s-default .cm-variable-3 {
150+
.cm-s-default .cm-variable-3, .cm-s-default .cm-type {
134151
color: #085; }
135152

136153
.cm-s-default .cm-comment {
@@ -177,10 +194,10 @@
177194

178195
/* Default styles for common addons */
179196
div.CodeMirror span.CodeMirror-matchingbracket {
180-
color: #0f0; }
197+
color: #0b0; }
181198

182199
div.CodeMirror span.CodeMirror-nonmatchingbracket {
183-
color: #f22; }
200+
color: #a22; }
184201

185202
.CodeMirror-matchingtag {
186203
background: rgba(255, 150, 0, 0.3); }
@@ -245,16 +262,15 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
245262
position: absolute;
246263
left: 0;
247264
top: 0;
265+
min-height: 100%;
248266
z-index: 3; }
249267

250268
.CodeMirror-gutter {
251269
white-space: normal;
252270
height: 100%;
253271
display: inline-block;
254-
margin-bottom: -30px;
255-
/* Hack to make IE7 behave */
256-
*zoom: 1;
257-
*display: inline; }
272+
vertical-align: top;
273+
margin-bottom: -30px; }
258274

259275
.CodeMirror-gutter-wrapper {
260276
position: absolute;
@@ -273,10 +289,11 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
273289
cursor: default;
274290
z-index: 4; }
275291

276-
.CodeMirror-gutter-wrapper {
277-
-webkit-user-select: none;
278-
-moz-user-select: none;
279-
user-select: none; }
292+
.CodeMirror-gutter-wrapper ::selection {
293+
background-color: transparent; }
294+
295+
.CodeMirror-gutter-wrapper ::-moz-selection {
296+
background-color: transparent; }
280297

281298
.CodeMirror-lines {
282299
cursor: text;
@@ -300,7 +317,9 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
300317
z-index: 2;
301318
position: relative;
302319
overflow: visible;
303-
-webkit-tap-highlight-color: transparent; }
320+
-webkit-tap-highlight-color: transparent;
321+
-webkit-font-variant-ligatures: contextual;
322+
font-variant-ligatures: contextual; }
304323

305324
.CodeMirror-wrap pre {
306325
word-wrap: break-word;
@@ -318,7 +337,11 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
318337
.CodeMirror-linewidget {
319338
position: relative;
320339
z-index: 2;
321-
overflow: auto; }
340+
padding: 0.1px;
341+
/* Force widget margins to stay inside of the container */ }
342+
343+
.CodeMirror-rtl pre {
344+
direction: rtl; }
322345

323346
.CodeMirror-code {
324347
outline: none; }
@@ -340,7 +363,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
340363
visibility: hidden; }
341364

342365
.CodeMirror-cursor {
343-
position: absolute; }
366+
position: absolute;
367+
pointer-events: none; }
344368

345369
.CodeMirror-measure pre {
346370
position: static; }
@@ -372,12 +396,8 @@ div.CodeMirror-dragcursors {
372396
background: #d7d4f0; }
373397

374398
.cm-searching {
375-
background: #ffa;
376-
background: rgba(255, 255, 0, 0.4); }
377-
378-
/* IE7 hack to prevent it from returning funny offsetTops on the spans */
379-
.CodeMirror span {
380-
*vertical-align: text-bottom; }
399+
background-color: #ffa;
400+
background-color: rgba(255, 255, 0, 0.4); }
381401

382402
/* Used to force a border model for a node */
383403
.cm-force-border {

0 commit comments

Comments
 (0)