diff --git a/package.json b/package.json index 380e8a700..6ca3c20a9 100644 --- a/package.json +++ b/package.json @@ -55,13 +55,13 @@ "vm-compatibility-layer": "0.1.0" }, "packageDependencies": { - "atom-dark-syntax": "0.10.0", + "atom-dark-syntax": "0.11.0", "atom-dark-ui": "0.21.0", - "atom-light-syntax": "0.10.0", + "atom-light-syntax": "0.11.0", "atom-light-ui": "0.20.0", - "base16-tomorrow-dark-theme": "0.8.0", - "solarized-dark-syntax": "0.6.0", - "solarized-light-syntax": "0.2.0", + "base16-tomorrow-dark-theme": "0.9.0", + "solarized-dark-syntax": "0.7.0", + "solarized-light-syntax": "0.3.0", "archive-view": "0.21.0", "autocomplete": "0.20.0", "autoflow": "0.12.0", diff --git a/spec/editor-view-spec.coffee b/spec/editor-view-spec.coffee index 60725cf02..d324001b0 100644 --- a/spec/editor-view-spec.coffee +++ b/spec/editor-view-spec.coffee @@ -1842,11 +1842,11 @@ describe "EditorView", -> it "re-renders the correct line number range when there are folds", -> editorView.editor.foldBufferRow(1) - expect(editorView.gutter.find('.line-number-1')).toHaveClass 'fold' + expect(editorView.gutter.find('.line-number-1')).toHaveClass 'folded' buffer.insert([0, 0], '\n') - expect(editorView.gutter.find('.line-number-2')).toHaveClass 'fold' + expect(editorView.gutter.find('.line-number-2')).toHaveClass 'folded' describe "when wrapping is on", -> it "renders a • instead of line number for wrapped portions of lines", -> @@ -1881,8 +1881,8 @@ describe "EditorView", -> it "styles folded line numbers", -> editor.createFold(3, 5) - expect(editorView.gutter.find('.line-number.fold').length).toBe 1 - expect(editorView.gutter.find('.line-number.fold:eq(0)').intValue()).toBe 4 + expect(editorView.gutter.find('.line-number.folded').length).toBe 1 + expect(editorView.gutter.find('.line-number.folded:eq(0)').intValue()).toBe 4 describe "when the scrollView is scrolled to the right", -> it "adds a drop shadow to the gutter", -> diff --git a/src/gutter.coffee b/src/gutter.coffee index 53e960e4a..3cddd9e61 100644 --- a/src/gutter.coffee +++ b/src/gutter.coffee @@ -208,8 +208,8 @@ class Gutter extends View rowValue = (row + 1).toString() classes = "line-number line-number-#{row}" - classes += ' fold' if editor.isFoldedAtBufferRow(row) classes += ' foldable' if row isnt lastRow and editor.isFoldableAtBufferRow(row) + classes += ' folded' if editor.isFoldedAtBufferRow(row) rowValuePadding = _.multiplyString(' ', maxDigits - rowValue.length) diff --git a/static/editor.less b/static/editor.less index ff65b9441..04e10821c 100644 --- a/static/editor.less +++ b/static/editor.less @@ -35,7 +35,7 @@ position: relative; } -.editor .gutter .line-number.fold.cursor-line { +.editor .gutter .line-number.folded.cursor-line { opacity: 1; } @@ -61,7 +61,7 @@ } .editor .gutter, .editor .gutter:hover { - .line-number.fold .icon-right { + .line-number.folded .icon-right { .octicon(chevron-right, 0.8em); visibility: visible;