Skip to content

Commit ef3b606

Browse files
committed
new release
1 parent 5324992 commit ef3b606

File tree

3 files changed

+8796
-8427
lines changed

3 files changed

+8796
-8427
lines changed

app.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var EQ = require('./css-element-queries/src/ElementQueries');
2-
var ResizeSensor = require('./css-element-queries/src/ResizeSensor');
1+
var EQ = require('./../css-element-queries-source/src/ElementQueries');
2+
var ResizeSensor = require('./../css-element-queries-source/src/ResizeSensor');
33
var Hammer = require('hammerjs/hammer');
44

55
require('codemirror/mode/xml/xml');
@@ -134,7 +134,7 @@ function example4(){
134134
}
135135
});
136136
new ResizeSensor(box, function(){
137-
logger.html('Changed to ' + box[0].clientWidth+'px height.');
137+
logger.html('Changed to ' + box[0].clientHeight+'px height.');
138138
});
139139
}
140140

build/css/codemirror.css

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
.cm-fat-cursor .CodeMirror-cursor {
5151
width: auto;
52-
border: 0;
52+
border: 0 !important;
5353
background: #7e7; }
5454

5555
.cm-fat-cursor div.CodeMirror-cursors {
@@ -86,8 +86,18 @@
8686
display: inline-block;
8787
text-decoration: inherit; }
8888

89+
.CodeMirror-rulers {
90+
position: absolute;
91+
left: 0;
92+
right: 0;
93+
top: -50px;
94+
bottom: -20px;
95+
overflow: hidden; }
96+
8997
.CodeMirror-ruler {
9098
border-left: 1px solid #ccc;
99+
top: 0;
100+
bottom: 0;
91101
position: absolute; }
92102

93103
/* DEFAULT THEME */
@@ -245,16 +255,15 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
245255
position: absolute;
246256
left: 0;
247257
top: 0;
258+
min-height: 100%;
248259
z-index: 3; }
249260

250261
.CodeMirror-gutter {
251262
white-space: normal;
252263
height: 100%;
253264
display: inline-block;
254-
margin-bottom: -30px;
255-
/* Hack to make IE7 behave */
256-
*zoom: 1;
257-
*display: inline; }
265+
vertical-align: top;
266+
margin-bottom: -30px; }
258267

259268
.CodeMirror-gutter-wrapper {
260269
position: absolute;
@@ -300,7 +309,9 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
300309
z-index: 2;
301310
position: relative;
302311
overflow: visible;
303-
-webkit-tap-highlight-color: transparent; }
312+
-webkit-tap-highlight-color: transparent;
313+
-webkit-font-variant-ligatures: none;
314+
font-variant-ligatures: none; }
304315

305316
.CodeMirror-wrap pre {
306317
word-wrap: break-word;
@@ -340,7 +351,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
340351
visibility: hidden; }
341352

342353
.CodeMirror-cursor {
343-
position: absolute; }
354+
position: absolute;
355+
pointer-events: none; }
344356

345357
.CodeMirror-measure pre {
346358
position: static; }
@@ -375,10 +387,6 @@ div.CodeMirror-dragcursors {
375387
background: #ffa;
376388
background: rgba(255, 255, 0, 0.4); }
377389

378-
/* IE7 hack to prevent it from returning funny offsetTops on the spans */
379-
.CodeMirror span {
380-
*vertical-align: text-bottom; }
381-
382390
/* Used to force a border model for a node */
383391
.cm-force-border {
384392
padding-right: .1px; }

0 commit comments

Comments
 (0)