mirror of
https://github.com/atom/atom.git
synced 2026-04-06 03:02:13 -04:00
Move theme activation to RootView
This commit is contained in:
@@ -7,7 +7,6 @@ EditSession = require 'edit-session'
|
||||
CursorView = require 'cursor-view'
|
||||
SelectionView = require 'selection-view'
|
||||
Native = require 'native'
|
||||
TextMateTheme = require 'text-mate-theme'
|
||||
fs = require 'fs'
|
||||
|
||||
$ = require 'jquery'
|
||||
@@ -55,7 +54,6 @@ class Editor extends View
|
||||
|
||||
initialize: ({editSession, @mini} = {}) ->
|
||||
requireStylesheet 'editor.css'
|
||||
TextMateTheme.activate('Twilight')
|
||||
|
||||
@id = Editor.idCounter++
|
||||
@lineCache = []
|
||||
|
||||
@@ -12,6 +12,7 @@ Pane = require 'pane'
|
||||
PaneColumn = require 'pane-column'
|
||||
PaneRow = require 'pane-row'
|
||||
StatusBar = require 'status-bar'
|
||||
TextMateTheme = require 'text-mate-theme'
|
||||
|
||||
module.exports =
|
||||
class RootView extends View
|
||||
@@ -32,6 +33,7 @@ class RootView extends View
|
||||
|
||||
initialize: (pathToOpen, { @extensionStates, suppressOpen } = {}) ->
|
||||
window.rootView = this
|
||||
TextMateTheme.activate('Twilight')
|
||||
|
||||
@extensionStates ?= {}
|
||||
@extensions = {}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
.editor {
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
background: #333;
|
||||
color: white;
|
||||
cursor: default;
|
||||
-webkit-user-select: none;
|
||||
-webkit-box-flex: 1;
|
||||
@@ -98,10 +96,6 @@
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.editor.focused .cursor {
|
||||
border-color: #9dff9d;
|
||||
}
|
||||
|
||||
.editor.focused .cursor.idle {
|
||||
-webkit-animation: blink 0.8s;
|
||||
-webkit-animation-iteration-count: infinite;
|
||||
|
||||
Reference in New Issue
Block a user