diff --git a/Rakefile b/Rakefile index 2c5375001..ee78786b2 100644 --- a/Rakefile +++ b/Rakefile @@ -82,7 +82,8 @@ task "create-dot-atom" do `mkdir "#{DOT_ATOM_PATH}"` `cp "#{dot_atom_template_path}/atom.coffee" "#{DOT_ATOM_PATH}"` `cp "#{dot_atom_template_path}/packages" "#{DOT_ATOM_PATH}"` - `cp -r "#{dot_atom_template_path}/themes" "#{DOT_ATOM_PATH}"` + `cp -r "#{ATOM_SRC_PATH}/themes" "#{DOT_ATOM_PATH}"` + `cp "#{ATOM_SRC_PATH}/vendor/themes/IR_Black.tmTheme" "#{DOT_ATOM_PATH}/themes"` end desc "Clone default bundles into vendor/bundles directory" diff --git a/spec/app/text-mate-theme-spec.coffee b/spec/app/text-mate-theme-spec.coffee index 381d3297e..5191ced55 100644 --- a/spec/app/text-mate-theme-spec.coffee +++ b/spec/app/text-mate-theme-spec.coffee @@ -21,7 +21,7 @@ describe "TextMateTheme", -> it "returns rulesets representing the theme's global style settings", -> expect(rulesets[0]).toEqual - selector: '.editor' + selector: '.editor, .editor .gutter' properties: 'background-color': '#141414' 'color': '#F8F8F8' @@ -37,7 +37,7 @@ describe "TextMateTheme", -> 'background-color': "rgba(221, 240, 255, 0.2)" it "returns an array of objects representing the theme's scope selectors", -> - expect(rulesets[11]).toEqual + expect(rulesets[12]).toEqual comment: "Invalid – Deprecated" selector: ".invalid.deprecated" properties: @@ -45,7 +45,7 @@ describe "TextMateTheme", -> # 'font-style': 'italic' 'text-decoration': 'underline' - expect(rulesets[12]).toEqual + expect(rulesets[13]).toEqual comment: "Invalid – Illegal" selector: ".invalid.illegal" properties: diff --git a/src/app/atom.coffee b/src/app/atom.coffee index ee5c8a442..95cb4b20a 100644 --- a/src/app/atom.coffee +++ b/src/app/atom.coffee @@ -9,7 +9,7 @@ originalSendMessageToBrowserProcess = atom.sendMessageToBrowserProcess _.extend atom, exitWhenDone: window.location.params.exitWhenDone - + loadedThemes: [] pendingBrowserProcessCallbacks: {} loadPackages: -> @@ -39,12 +39,16 @@ _.extend atom, .filter (name) -> not _.contains(disabledPackages, name) loadThemes: -> - themeNames = config.get("core.themes") ? ['IR_Black'] + themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black'] themeNames = [themeNames] unless _.isArray(themeNames) @loadTheme(themeName) for themeName in themeNames loadTheme: (name) -> - Theme.load(name) + @loadedThemes.push Theme.load(name) + + getAtomThemeStylesheets: -> + themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black'] + themeNames = [themeNames] unless _.isArray(themeNames) open: (args...) -> @sendMessageToBrowserProcess('open', args) diff --git a/src/app/config.coffee b/src/app/config.coffee index 448a7fc2d..ab1eae901 100644 --- a/src/app/config.coffee +++ b/src/app/config.coffee @@ -9,9 +9,10 @@ Theme = require 'theme' configDirPath = fs.absolute("~/.atom") configJsonPath = fs.join(configDirPath, "config.json") userInitScriptPath = fs.join(configDirPath, "atom.coffee") -bundledThemesDirPath = fs.join(resourcePath, "themes") bundledPackagesDirPath = fs.join(resourcePath, "src/packages") -bundledVendorPackagesDirPath = fs.join(resourcePath, "vendor/packages") +bundledThemesDirPath = fs.join(resourcePath, "themes") +vendoredPackagesDirPath = fs.join(resourcePath, "vendor/packages") +vendoredThemesDirPath = fs.join(resourcePath, "vendor/themes") userThemesDirPath = fs.join(configDirPath, "themes") userPackagesDirPath = fs.join(configDirPath, "packages") @@ -20,8 +21,8 @@ require.paths.unshift userPackagesDirPath module.exports = class Config configDirPath: configDirPath - themeDirPaths: [userThemesDirPath, bundledThemesDirPath] - packageDirPaths: [userPackagesDirPath, bundledVendorPackagesDirPath, bundledPackagesDirPath] + themeDirPaths: [userThemesDirPath, bundledThemesDirPath, vendoredThemesDirPath] + packageDirPaths: [userPackagesDirPath, vendoredPackagesDirPath, bundledPackagesDirPath] defaultSettings: null settings: null @@ -34,8 +35,8 @@ class Config load: -> @loadUserConfig() @requireUserInitScript() - atom.loadPackages() atom.loadThemes() + atom.loadPackages() loadUserConfig: -> if fs.exists(configJsonPath) diff --git a/src/app/text-mate-theme.coffee b/src/app/text-mate-theme.coffee index 9c56ec222..ee78cdea7 100644 --- a/src/app/text-mate-theme.coffee +++ b/src/app/text-mate-theme.coffee @@ -35,10 +35,10 @@ class TextMateTheme extends Theme getRulesets: -> @rulesets buildGlobalSettingsRulesets: ({settings}) -> - { background, foreground, caret, selection } = settings + { background, foreground, caret, selection, lineHighlight } = settings @rulesets.push - selector: '.editor' + selector: '.editor, .editor .gutter' properties: 'background-color': @translateColor(background) 'color': @translateColor(foreground) @@ -53,6 +53,11 @@ class TextMateTheme extends Theme properties: 'background-color': @translateColor(selection) + @rulesets.push + selector: '.editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line' + properties: + 'background-color': @translateColor(lineHighlight) + buildScopeSelectorRulesets: (scopeSelectorSettings) -> for { name, scope, settings } in scopeSelectorSettings continue unless scope diff --git a/src/app/theme.coffee b/src/app/theme.coffee index 3c438b9b2..410add427 100644 --- a/src/app/theme.coffee +++ b/src/app/theme.coffee @@ -12,8 +12,7 @@ class Theme if fs.exists(name) path = name else - path = fs.resolve(config.themeDirPaths..., name) - path ?= fs.resolve(config.themeDirPaths..., name + ".tmTheme") + path = fs.resolve(config.themeDirPaths..., name, ['', '.tmTheme']) throw new Error("No theme exists named '#{name}'") unless path @@ -31,7 +30,7 @@ class Theme load: -> for stylesheetPath, stylesheetContent of @stylesheets - applyStylesheet(stylesheetPath, stylesheetContent) + applyStylesheet(stylesheetPath, stylesheetContent, 'userTheme') deactivate: -> for stylesheetPath, stylesheetContent of @stylesheets diff --git a/src/app/window.coffee b/src/app/window.coffee index 9e53ed5b6..902514bb1 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -70,18 +70,23 @@ windowAdditions = $("head style[id='#{id}']") requireStylesheet: (path) -> - unless fullPath = require.resolve(path) + if fullPath = require.resolve(path) + window.applyStylesheet(fullPath, fs.read(fullPath)) + unless fullPath throw new Error("Could not find a file at path '#{path}'") - window.applyStylesheet(fullPath, fs.read(fullPath)) removeStylesheet: (path) -> unless fullPath = require.resolve(path) throw new Error("Could not find a file at path '#{path}'") window.stylesheetElementForId(fullPath).remove() - applyStylesheet: (id, text) -> + applyStylesheet: (id, text, ttype = 'bundled') -> unless window.stylesheetElementForId(id).length - $('head').append "" + if $("head style.#{ttype}").length + $("head style.#{ttype}:last").after "" + else + $("head").append "" + reload: -> if rootView?.getModifiedBuffers().length > 0 diff --git a/src/packages/autocomplete/stylesheets/autocomplete.css b/src/packages/autocomplete/stylesheets/autocomplete.css index 7f6c17bdb..75110eb25 100644 --- a/src/packages/autocomplete/stylesheets/autocomplete.css +++ b/src/packages/autocomplete/stylesheets/autocomplete.css @@ -1,11 +1,5 @@ .select-list.autocomplete { - min-width: 150px; - border: 2px solid #222; - webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); box-sizing: content-box; - margin-left: 0px; - width: auto; - -webkit-box-shadow: none; } .autocomplete ol { @@ -13,7 +7,3 @@ overflow-y: scroll; max-height: 200px; } - -.autocomplete ol li { - padding: 0.1em 0.2em; -} diff --git a/src/packages/command-logger/stylesheets/command-logger.css b/src/packages/command-logger/stylesheets/command-logger.css index 5e9f34ffa..87a21e502 100644 --- a/src/packages/command-logger/stylesheets/command-logger.css +++ b/src/packages/command-logger/stylesheets/command-logger.css @@ -4,34 +4,8 @@ height: 100%; top: 0px; left: 0px; - background: #1e1e1e; - color: #eee; overflow: auto; z-index: 99; - padding-top: 10px; - padding-bottom: 10px; -} - -.command-logger .category-header { - text-align: center; - padding-bottom: 5px; - font-size: 16px; -} - -.command-logger .category-summary { - text-align: center; - padding-bottom: 10px; - font-size: 12px; -} - -.command-logger .tree-map { - margin: auto; - background-color: #efefef; - border: 1px solid #999; -} - -body.command-logger-node-text { - background-color: transparent; } .command-logger-node-text div { @@ -42,8 +16,5 @@ body.command-logger-node-text { } .command-logger-node-text span { - font-size: 10px; - color: #fff; - text-shadow: #000 1px 1px 4px; -webkit-user-select: none; } diff --git a/src/packages/outline-view/spec/outline-view-spec.coffee b/src/packages/outline-view/spec/outline-view-spec.coffee index e74981663..64c2e17c5 100644 --- a/src/packages/outline-view/spec/outline-view-spec.coffee +++ b/src/packages/outline-view/spec/outline-view-spec.coffee @@ -1,6 +1,7 @@ RootView = require 'root-view' OutlineView = require 'outline-view' TagGenerator = require 'outline-view/src/tag-generator' +fs = require 'fs' describe "OutlineView", -> [rootView, outlineView, setArraySpy] = [] @@ -152,6 +153,21 @@ describe "OutlineView", -> expect(rootView.getActiveEditor().getPath()).toBe rootView.project.resolve("tagged-duplicate.js") expect(rootView.getActiveEditor().getCursorBufferPosition()).toEqual [0,4] + describe "when the tag is in a file that doesn't exist", -> + beforeEach -> + fs.move(rootView.project.resolve("tagged-duplicate.js"), rootView.project.resolve("tagged-duplicate-renamed.js")) + + afterEach -> + fs.move(rootView.project.resolve("tagged-duplicate-renamed.js"), rootView.project.resolve("tagged-duplicate.js")) + + it "doesn't display the tag", -> + rootView.open("tagged.js") + editor = rootView.getActiveEditor() + editor.setCursorBufferPosition([8,14]) + editor.trigger 'outline-view:jump-to-declaration' + expect(outlineView.list.children('li').length).toBe 1 + expect(outlineView.list.children('li:first').find('.function-name')).toHaveText 'tagged.js' + describe "project outline", -> it "displays all tags", -> rootView.open("tagged.js") diff --git a/src/packages/outline-view/src/outline-view.coffee b/src/packages/outline-view/src/outline-view.coffee index fadd4e788..ace29b7c6 100644 --- a/src/packages/outline-view/src/outline-view.coffee +++ b/src/packages/outline-view/src/outline-view.coffee @@ -102,7 +102,9 @@ class OutlineView extends SelectList getTagLine: (tag) -> pattern = $.trim(tag.pattern?.replace(/(^^\/\^)|(\$\/$)/g, '')) # Remove leading /^ and trailing $/ return unless pattern - for line, index in fs.read(@rootView.project.resolve(tag.file)).split('\n') + file = @rootView.project.resolve(tag.file) + return unless fs.isFile(file) + for line, index in fs.read(file).split('\n') return new Point(index, 0) if pattern is $.trim(line) jumpToDeclaration: -> diff --git a/src/packages/status-bar/stylesheets/status-bar.css b/src/packages/status-bar/stylesheets/status-bar.css index e15105d5e..3fe635f49 100644 --- a/src/packages/status-bar/stylesheets/status-bar.css +++ b/src/packages/status-bar/stylesheets/status-bar.css @@ -1,68 +1,9 @@ .status-bar { - background-color: #303030; - border-top: 1px solid #454545; - padding: 4px 10px 3px; - font-size: 11px; - line-height: 14px; - color: #969696; position: relative; -webkit-user-select: none; cursor: default; } -.status-bar .cursor-position, -.status-bar .grammar-name { - padding-left: 10px; -} - -.status-bar .grammar-name { - cursor: pointer; -} - .status-bar .git-branch { float: right; -} - -.status-bar .branch-label { - vertical-align: baseline; -} - -.status-bar .git-status.octicons { - display: none; - padding-left: 10px; - margin-top:-2px; -} - -.status-bar .octicons:before { - font-family: 'Octicons Regular'; - font-size: 14px; - width: 14px; - height: 14px; - line-height: 14px; - -webkit-font-smoothing: antialiased; - display: inline-block; - vertical-align: middle; - margin-right: 5px; -} - -.status-bar .branch-icon:before { - content: "\f020"; -} - -.status-bar .git-status.octicons.modified-status-icon { - color: #f78a46; - display: inline-block; -} - -.status-bar .modified-status-icon:before { - content: "\f26d"; -} - -.status-bar .git-status.octicons.new-status-icon { - color: #5293d8; - display: inline-block; -} - -.status-bar .new-status-icon:before { - content: "\f26b"; -} +} \ No newline at end of file diff --git a/src/packages/tabs/stylesheets/tabs.css b/src/packages/tabs/stylesheets/tabs.css index 02650af58..0239bc734 100644 --- a/src/packages/tabs/stylesheets/tabs.css +++ b/src/packages/tabs/stylesheets/tabs.css @@ -1,143 +1,31 @@ .tabs { - background: #333333; - border-bottom: 4px solid #424242; - font: caption; -webkit-user-select: none; - user-select: none; } .tab { - cursor: default; - padding: 2px 21px 2px 9px; - background-image: -webkit-linear-gradient(#444, #3d3d3d); display: table-cell; position: relative; width:175px; - border-top: 1px solid #383838; - border-right: 1px solid #2e2e2e; - border-bottom: 1px solid #2e2e2e; - box-shadow: inset 0 0 5px #383838, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a, inset 1px 0 0 #4a4a4a; min-width: 40px; box-sizing: border-box; height: 24px; } -.tab, -.tab .close-icon { - color: #aaa; -} - .tab.file-modified .close-icon { - border-color: #aaa; -} - -.tab.active, -.tab.active:hover, -.tab.active .close-icon { - color: #e6e6e6; -} - -.tab.file-modified.active .close-icon { - border-color: #e6e6e6; -} - -.tab:hover .close-icon { - color: #c8c8c8; - border-color: #c8c8c8; -} - -.tab.file-modified .close-icon { - border: 3px solid #777; top: 6px; - border-radius: 10px; width: 5px; height: 5px; right: 5px; } -.tab.file-modified .close-icon:before { - content: ""; -} - -.tab:first-child { - box-shadow: inset 0 0 5px #383838, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a; -} - -.tab.active:first-child, -.tab.active:first-child:hover { - box-shadow: inset -1px 0 0 #595959; -} - -.tab.active, -.tab.active:hover { - border-top: 1px solid #4a4a4a; - box-shadow: inset -1px 0 0 #595959, inset 1px 0 0 #595959; - border-bottom: 0 none; - background-image: -webkit-linear-gradient(#555555, #424242); -} - -.tab.active:before, -.tab.active:after { - position: absolute; - bottom: -1px; - width: 4px; - height: 4px; - content: " "; - z-index: 3; - border: 1px solid #595959; -} -.tab.active:before { - border-bottom-right-radius: 4px; - border-width: 0 1px 1px 0; - box-shadow: 2px 2px 0 #424242; - left: -4px; -} -.tab.active:after { - right: -4px; - border-bottom-left-radius: 4px; - border-width: 0 0 1px 1px; - box-shadow: -2px 2px 0 #424242; -} -.tab.active:first-child:before { - display: none; -} - -.tab:hover { - color: #c8c8c8; - background-image: -webkit-linear-gradient(#474747, #444444); -} - .tab .file-name { - font-size: 11px; display: block; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - text-shadow: 0 -1px 1px black; position: absolute; left: 9px; top:4px; bottom:4px; right: 21px; -} - -.tab .close-icon { - font-family: 'Octicons Regular'; - font-size: 14px; - width: 14px; - height: 14px; - display: block; - cursor: pointer; - position: absolute; - right: 4px; - top: -1px; - -webkit-font-smoothing: antialiased; -} - -.tab .close-icon:before { - content: "\f081"; -} - -.tab .close-icon:hover { - color: white; -} +} \ No newline at end of file diff --git a/src/packages/tree-view/src/tree-view.coffee b/src/packages/tree-view/src/tree-view.coffee index 8dd8ef0e3..08e121d7b 100644 --- a/src/packages/tree-view/src/tree-view.coffee +++ b/src/packages/tree-view/src/tree-view.coffee @@ -136,7 +136,6 @@ class TreeView extends ScrollView resizeTreeView: (e) => @css(width: e.pageX) - @resizer.css(left: e.pageX) updateRoot: -> @root?.remove() diff --git a/src/packages/tree-view/stylesheets/tree-view.css b/src/packages/tree-view/stylesheets/tree-view.css index 0bd94139a..38d932c96 100644 --- a/src/packages/tree-view/stylesheets/tree-view.css +++ b/src/packages/tree-view/stylesheets/tree-view.css @@ -1,45 +1,31 @@ .tree-view { position: relative; height: 100%; - background: #1e1e1e; overflow: auto; cursor: default; -webkit-user-select: none; - border-right: 2px solid #191919; min-width: 100px; z-index: 2; } .tree-view .tree-view-resizer { - float: right; - height: 100%; + position: absolute; + top: 0; + right: 0; + bottom: 0; width: 10px; background: transparent; cursor: col-resize; position: fixed; + z-index: 3; } .tree-view .entry { - text-shadow: 0 -1px 0 #000; text-wrap: none; white-space: nowrap; } -.tree-view .entries { - margin-left: 12px; -} - -.tree-view .entries .file .name { - margin-left: 15px; -} - -.tree-view .directory.selected > .header > .name, -.tree-view .selected > .name { - color: #d2d2d2; -} - .tree-view .selected > .highlight { - background-image: -webkit-linear-gradient(#4e4e4e, #434343); position: absolute; left: 0; right: 0; @@ -48,16 +34,6 @@ z-index: -1; } -.tree-view:focus .selected > .highlight { - background-image: -webkit-linear-gradient(#7e7e7e, #737373); -} - -.tree-view:focus .directory.selected > .header > .name, -.tree-view:focus .selected > .name { - color: #fff; - text-shadow: 0 -1px 0 #7E4521; -} - .tree-view .entry.file .name { display: block; } @@ -66,147 +42,10 @@ display: inline-block; } -.tree-view .directory .header { - color: #bebebe; -} - -.tree-view .file { - color: #7d7d7d; -} - -.tree-view .entry:hover, -.tree-view .directory .header:hover .name, -.tree-view .directory .header:hover .disclosure-arrow { - color: #ebebeb; -} - -.tree-view .file .name, -.tree-view .directory .header { - padding-top: 4px; - padding-bottom: 4px; - padding-right: 10px; -} - -.tree-view .ignored { - color: #555; -} - -.tree-view .modified { - color: #f78a46; -} - -.tree-view .new { - color: #5293d8; -} - .tree-view-dialog { position: absolute; bottom: 0; left: 0; right: 0; - background-color: #333; - border-top: 1px solid #555; - -webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); z-index: 99; - padding: 5px; -} - -.tree-view-dialog .prompt { - padding-bottom: 3px; - font-size: 12px; - line-height: 16px; - color: #aaa; -} - -.tree-view-dialog .prompt span { - position: relative; - top: -1px; -} - -.tree-view-dialog .prompt:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 3px; - -webkit-font-smoothing: antialiased; -} - -.tree-view-dialog .prompt.add:before { - content: "\f086"; -} - -.tree-view-dialog .prompt.move:before { - content: "\f03e"; -} - -.tree-view .directory .header .name, -.tree-view .file .name { - position: relative; - padding-left: 21px; -} - -.tree-view .directory .header .name:before, -.tree-view .file .name:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - position: absolute; - left: 0; -} - -.tree-view .disclosure-arrow:before { - font-family: 'Octicons Regular'; - font-size: 12px; - width: 12px; - height: 12px; - line-height: 16px; - margin-right: 3px; - -webkit-font-smoothing: antialiased; -} - -.tree-view .directory .header .directory-icon:before { - content: "\f016"; - top: -5px; -} - -.tree-view .directory .header .repository-icon:before { - content: "\f001"; - top: -4px; -} - -.tree-view .directory .header .submodule-icon:before { - content: "\f017"; - top: -5px; -} - -.tree-view .file .text-icon:before { - content: "\f011"; - top: -2px; -} - -.tree-view .file .image-icon:before { - content: "\f012"; - top: -2px; -} - -.tree-view .file .compressed-icon:before { - content: "\f013"; - top: -2px; -} - -.tree-view .file .pdf-icon:before { - content: "\f014"; - top: -2px; -} - -.tree-view .directory > .header .disclosure-arrow:before { - content: "\f05a"; -} - -.tree-view .directory.expanded > .header .disclosure-arrow:before { - content: "\f05b"; } diff --git a/src/stdlib/fs.coffee b/src/stdlib/fs.coffee index 976f3bb5f..39ae82334 100644 --- a/src/stdlib/fs.coffee +++ b/src/stdlib/fs.coffee @@ -143,7 +143,7 @@ module.exports = if extension == "" return path if @exists(path) else - pathWithExtension = path + "." + extension + pathWithExtension = path + "." + extension.replace(/^\./, "") return pathWithExtension if @exists(pathWithExtension) undefined diff --git a/static/atom.css b/static/atom.css index 13a207fee..4f70a0574 100644 --- a/static/atom.css +++ b/static/atom.css @@ -1,5 +1,4 @@ html, body { - font: caption; width: 100%; height: 100%; overflow: hidden; @@ -9,7 +8,6 @@ html, body { height: 100%; overflow: hidden; position: relative; - background-color: #333333; } #root-view #horizontal { @@ -28,17 +26,6 @@ html, body { position: relative; } -#root-view #panes:before { - display: block; - content: "\f208"; - font-family: 'Octicons Regular'; - color: #303030; - -webkit-font-smoothing: antialiased; - font-size: 100vmin; - line-height: 100vmin; - text-align: center; -} - #root-view #panes .column { position: absolute; top: 0; @@ -66,28 +53,4 @@ html, body { left: 0; right: 0; box-sizing: border-box; -} - -#root-view #panes .row > * + * { - border-left: 5px solid #515151; -} - -#root-view #panes .column > * + * { - border-top: 5px solid #515151; -} - -.error { - background: #991212 !important; - -webkit-transition: background 300ms ease-out; -} - -.clear-float { - clear: both; -} - -@font-face { - font-family: 'Octicons Regular'; - src: url("octicons-regular-webfont.woff") format("woff"); - font-weight: normal; - font-style: normal; -} +} \ No newline at end of file diff --git a/static/editor.css b/static/editor.css index b2f84e73a..bdd9f2825 100644 --- a/static/editor.css +++ b/static/editor.css @@ -6,7 +6,6 @@ -webkit-box-flex: 1; position: relative; z-index: 0; - font-family: Inconsolata, Monaco, Courier; } .editor.mini { @@ -17,7 +16,6 @@ position: absolute; height: 100%; overflow: hidden; - color: rgba(255, 255, 255, .3); text-align: right; } @@ -25,28 +23,10 @@ position: relative; } -.editor .gutter .line-number { - padding-left: 0.4em; - padding-right: 0.8em; -} - -.editor.focused .line-number.cursor-line { - color: rgba(255, 255, 255, .6); -} - -.editor.focused .line-number.cursor-line-no-selection, -.editor.focused .line.cursor-line { - background-color: rgba(255, 255, 255, .20); -} - .editor.mini .gutter { display: none; } -.editor .gutter.drop-shadow { - -webkit-box-shadow: -2px 0px 10px 2px #222; -} - .editor .vertical-scrollbar { position: absolute; right: 0; @@ -123,27 +103,4 @@ position: absolute; pointer-events: none; z-index: -1; -} - -@-webkit-keyframes highlight { - from { background-color: rgba(100, 255, 100, 0.7); } - to { background-color: null; } -} - -.editor .highlighted.selection .region { - -webkit-animation-name: highlight; - -webkit-animation-duration: 1s; - -webkit-animation-iteration-count: 1; -} - -.editor .fold { - background-color: #444; -} - -.editor .fold.selected { - background-color: #244; -} - -.editor .invisible { - opacity: 0.2; -} +} \ No newline at end of file diff --git a/static/grammar-view.css b/static/grammar-view.css index 582dd98d8..1cbeeba30 100644 --- a/static/grammar-view.css +++ b/static/grammar-view.css @@ -5,24 +5,4 @@ .grammar-view ol { max-height: 300px; -} - -.grammar-view ol li { - padding: 2px; - border-bottom: 1px solid rgba(255, 255, 255, .05); - line-height: 16px; -} - -.grammar-view ol li.grammar { - padding-left: 21px; -} - -.grammar-view ol li.current-grammar:before { - font-family: 'Octicons Regular'; - width: 16px; - height: 16px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - color: #ccc; - content: '\f03a'; -} +} \ No newline at end of file diff --git a/static/index.html b/static/index.html index 582a8c87b..e65255bd2 100644 --- a/static/index.html +++ b/static/index.html @@ -1,5 +1,5 @@ - + diff --git a/static/octicons-regular-webfont.woff b/static/octicons-regular-webfont.woff deleted file mode 100644 index 0e9c3f1ee..000000000 Binary files a/static/octicons-regular-webfont.woff and /dev/null differ diff --git a/static/select-list.css b/static/select-list.css index a17e22023..f2472e3c6 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -1,36 +1,19 @@ .select-list { position: absolute; - width: 80%; + width: 600px; top: 0; left: 50%; - margin-left: -40%; - background-color: #444; + margin-left: -300px; box-sizing: border-box; - color: #eee; - -webkit-box-shadow: 0 0 5px 5px #222; - padding: 5px; z-index: 99; - cursor: pointer; } .select-list .editor { - margin-bottom: 5px; + box-sizing: border-box; + padding: 5px; } .select-list ol { position: relative; overflow-y: auto; -} - -.select-list li:hover { - background-color: #555; -} - -.select-list ol .selected { - background: green; -} - -.select-list .error { - padding-top: 5px; - font-weight: bold; -} +} \ No newline at end of file diff --git a/themes/Atom - Dark/atom.css b/themes/Atom - Dark/atom.css new file mode 100644 index 000000000..2e5a1355b --- /dev/null +++ b/themes/Atom - Dark/atom.css @@ -0,0 +1,40 @@ +html, body, +#root-view { + font: caption; + background-color: #333333; +} + +#root-view #panes:before { + display: block; + content: "\f208"; + font-family: 'Octicons Regular'; + color: #303030; + -webkit-font-smoothing: antialiased; + font-size: 100vmin; + line-height: 100vmin; + text-align: center; +} + +#root-view #panes .row > * + * { + border-left: 5px solid #515151; +} + +#root-view #panes .column > * + * { + border-top: 5px solid #515151; +} + +.error { + background: #991212 !important; + -webkit-transition: background 300ms ease-out; +} + +.clear-float { + clear: both; +} + +@font-face { + font-family: 'Octicons Regular'; + src: url("octicons-regular-webfont.woff") format("woff"); + font-weight: normal; + font-style: normal; +} diff --git a/themes/Atom - Dark/autocomplete.css b/themes/Atom - Dark/autocomplete.css new file mode 100644 index 000000000..290713336 --- /dev/null +++ b/themes/Atom - Dark/autocomplete.css @@ -0,0 +1,17 @@ +.select-list.autocomplete { + min-width: 150px; + border: 2px solid #222; + webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); + margin-left: 0px; + width: auto; +} + +.autocomplete ol { + position: relative; + overflow-y: scroll; + max-height: 200px; +} + +.autocomplete ol li { + padding: 0.1em 0.2em; +} diff --git a/themes/Atom - Dark/command-logger.css b/themes/Atom - Dark/command-logger.css new file mode 100644 index 000000000..56822c247 --- /dev/null +++ b/themes/Atom - Dark/command-logger.css @@ -0,0 +1,41 @@ +.command-logger { + background: #1e1e1e; + color: #eee; + padding-top: 10px; + padding-bottom: 10px; +} + +.command-logger .category-header { + text-align: center; + padding-bottom: 5px; + font-size: 16px; +} + +.command-logger .category-summary { + text-align: center; + padding-bottom: 10px; + font-size: 12px; +} + +.command-logger .tree-map { + margin: auto; + background-color: #efefef; + border: 1px solid #999; +} + +body.command-logger-node-text { + background-color: transparent; +} + +.command-logger-node-text div { + display: table-cell; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + +.command-logger-node-text span { + font-size: 10px; + color: #fff; + text-shadow: #000 1px 1px 4px; +} diff --git a/src/packages/command-palette/stylesheets/command-palette.css b/themes/Atom - Dark/command-palette.css similarity index 86% rename from src/packages/command-palette/stylesheets/command-palette.css rename to themes/Atom - Dark/command-palette.css index c3c29053c..0cadfbcae 100644 --- a/src/packages/command-palette/stylesheets/command-palette.css +++ b/themes/Atom - Dark/command-palette.css @@ -7,11 +7,6 @@ max-height: 300px; } -.command-palette ol li { - padding: 2px; - border-bottom: 1px solid rgba(255, 255, 255, .05); -} - .command-palette ol .event-description { float: left; display: inline-block; diff --git a/src/packages/command-panel/stylesheets/command-panel.css b/themes/Atom - Dark/command-panel.css similarity index 100% rename from src/packages/command-panel/stylesheets/command-panel.css rename to themes/Atom - Dark/command-panel.css diff --git a/themes/Atom - Dark/editor.css b/themes/Atom - Dark/editor.css new file mode 100644 index 000000000..59dcfdfe9 --- /dev/null +++ b/themes/Atom - Dark/editor.css @@ -0,0 +1,41 @@ +.editor { + font-family: Inconsolata, Monaco, Courier; +} + +.editor.mini { + height: auto; +} + +.editor .gutter .line-number { + padding-right: 1.3em; + min-width: 35px; + box-sizing: border-box; + text-align: right; +} + +.editor .gutter.drop-shadow { + -webkit-box-shadow: -2px 0px 10px 2px #222; +} + +@-webkit-keyframes highlight { + from { background-color: rgba(100, 255, 100, 0.7); } + to { background-color: null; } +} + +.editor .highlighted.selection .region { + -webkit-animation-name: highlight; + -webkit-animation-duration: 1s; + -webkit-animation-iteration-count: 1; +} + +.editor .fold { + background-color: #444; +} + +.editor .fold.selected { + background-color: #244; +} + +.editor .invisible { + opacity: 0.2; +} diff --git a/src/packages/fuzzy-finder/stylesheets/fuzzy-finder.css b/themes/Atom - Dark/fuzzy-finder.css similarity index 86% rename from src/packages/fuzzy-finder/stylesheets/fuzzy-finder.css rename to themes/Atom - Dark/fuzzy-finder.css index 4257e3729..c417a12af 100644 --- a/src/packages/fuzzy-finder/stylesheets/fuzzy-finder.css +++ b/themes/Atom - Dark/fuzzy-finder.css @@ -1,6 +1,5 @@ .fuzzy-finder ol { overflow: hidden; - margin-bottom: 5px; -webkit-user-select: none; cursor: default; } @@ -39,8 +38,4 @@ .fuzzy-finder .file.pdf-name:before { content: "\f014"; -} - -.fuzzy-finder ol li { - border-bottom: 1px solid rgba(255, 255, 255, .05); -} +} \ No newline at end of file diff --git a/themes/Atom - Dark/grammar-view.css b/themes/Atom - Dark/grammar-view.css new file mode 100644 index 000000000..7be94f4c0 --- /dev/null +++ b/themes/Atom - Dark/grammar-view.css @@ -0,0 +1,17 @@ +.grammar-view ol li { + line-height: 16px; +} + +.grammar-view ol li.grammar { + padding-left: 21px; +} + +.grammar-view ol li.current-grammar:before { + font-family: 'Octicons Regular'; + width: 16px; + height: 16px; + margin-right: 5px; + -webkit-font-smoothing: antialiased; + color: #ccc; + content: '\f03a'; +} diff --git a/static/images/octocat-spinner-128.gif b/themes/Atom - Dark/images/octocat-spinner-128.gif similarity index 100% rename from static/images/octocat-spinner-128.gif rename to themes/Atom - Dark/images/octocat-spinner-128.gif diff --git a/src/packages/markdown-preview/stylesheets/markdown-preview.css b/themes/Atom - Dark/markdown-preview.css similarity index 100% rename from src/packages/markdown-preview/stylesheets/markdown-preview.css rename to themes/Atom - Dark/markdown-preview.css diff --git a/src/packages/outline-view/stylesheets/outline-view.css b/themes/Atom - Dark/outline-view.css similarity index 100% rename from src/packages/outline-view/stylesheets/outline-view.css rename to themes/Atom - Dark/outline-view.css diff --git a/themes/Atom - Dark/package.json b/themes/Atom - Dark/package.json new file mode 100644 index 000000000..9e58cbdb7 --- /dev/null +++ b/themes/Atom - Dark/package.json @@ -0,0 +1,19 @@ +{ + "stylesheets":[ + "atom.css", + "editor.css", + "grammar-view.css", + "select-list.css", + "tree-view.css", + "tabs.css", + "wrap-guide.css", + "status-bar.css", + "outline-view.css", + "markdown-preview.css", + "fuzzy-finder.css", + "command-panel.css", + "command-palette.css", + "command-logger.css", + "autocomplete.css" + ] +} \ No newline at end of file diff --git a/themes/Atom - Dark/select-list.css b/themes/Atom - Dark/select-list.css new file mode 100644 index 000000000..cf4d11f22 --- /dev/null +++ b/themes/Atom - Dark/select-list.css @@ -0,0 +1,41 @@ +.select-list { + background-color: #484848; + border: 1px solid #444; + color: #d2d2d2; + box-shadow: 0 0 10px #000; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + padding: 5px; + cursor: pointer; +} + +.select-list ol { + border: 1px solid #212121; +} + +.select-list ol li { + background-color: #292929; + border-bottom: 1px solid #212121; + padding: 5px; +} + +.select-list ol li:last-child { + border-bottom: none; +} + +.select-list .editor { + margin-bottom: 5px; +} + +.select-list li:hover { + background-color: #555; +} + +.select-list ol .selected { + background-image: -webkit-linear-gradient(#7e7e7e, #737373); +} + +.select-list .error { + padding-top: 5px; + font-weight: bold; +} \ No newline at end of file diff --git a/themes/Atom - Dark/status-bar.css b/themes/Atom - Dark/status-bar.css new file mode 100644 index 000000000..f517760f4 --- /dev/null +++ b/themes/Atom - Dark/status-bar.css @@ -0,0 +1,61 @@ +.status-bar { + background-color: #303030; + border-top: 1px solid #454545; + padding: 4px 10px 3px; + font-size: 11px; + line-height: 14px; + color: #969696; +} + +.status-bar .cursor-position, +.status-bar .grammar-name { + padding-left: 10px; +} + +.status-bar .grammar-name { + cursor: pointer; +} + +.status-bar .branch-label { + vertical-align: baseline; +} + +.status-bar .git-status.octicons { + display: none; + padding-left: 10px; + margin-top:-2px; +} + +.status-bar .octicons:before { + font-family: 'Octicons Regular'; + font-size: 14px; + width: 14px; + height: 14px; + line-height: 14px; + -webkit-font-smoothing: antialiased; + display: inline-block; + vertical-align: middle; + margin-right: 5px; +} + +.status-bar .branch-icon:before { + content: "\f020"; +} + +.status-bar .git-status.octicons.modified-status-icon { + color: #f78a46; + display: inline-block; +} + +.status-bar .modified-status-icon:before { + content: "\f26d"; +} + +.status-bar .git-status.octicons.new-status-icon { + color: #5293d8; + display: inline-block; +} + +.status-bar .new-status-icon:before { + content: "\f26b"; +} diff --git a/themes/Atom - Dark/tabs.css b/themes/Atom - Dark/tabs.css new file mode 100644 index 000000000..732a5c3aa --- /dev/null +++ b/themes/Atom - Dark/tabs.css @@ -0,0 +1,123 @@ +.tabs { + background: #333333; + border-bottom: 4px solid #424242; + font: caption; + box-shadow: inset 0 -1px 0 #2e2e2e; +} + +.tab { + cursor: default; + padding: 2px 21px 2px 9px; + background-image: -webkit-linear-gradient(#444, #3d3d3d); + border-top: 1px solid #383838; + border-right: 1px solid #2e2e2e; + border-bottom: 1px solid #2e2e2e; + box-shadow: inset 0 0 5px #383838, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a, inset 1px 0 0 #4a4a4a; +} + +.tab, +.tab .close-icon { + color: #aaa; +} + +.tab.file-modified .close-icon { + border-color: #aaa; +} + +.tab.active, +.tab.active:hover, +.tab.active .close-icon { + color: #e6e6e6; +} + +.tab.file-modified.active .close-icon { + border-color: #e6e6e6; +} + +.tab:hover .close-icon { + color: #c8c8c8; + border-color: #c8c8c8; +} + +.tab.file-modified .close-icon { + border: 3px solid #777; + border-radius: 10px; +} + +.tab.file-modified .close-icon:before { + content: ""; +} + +.tab:first-child { + box-shadow: inset 0 0 5px #383838, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a; +} + +.tab.active:first-child, +.tab.active:first-child:hover { + box-shadow: inset -1px 0 0 #595959; +} + +.tab.active, +.tab.active:hover { + border-top: 1px solid #4a4a4a; + box-shadow: inset -1px 0 0 #595959, inset 1px 0 0 #595959; + border-bottom: 0 none; + background-image: -webkit-linear-gradient(#555555, #424242); +} + +.tab.active:before, +.tab.active:after { + position: absolute; + bottom: -1px; + width: 4px; + height: 4px; + content: " "; + z-index: 3; + border: 1px solid #595959; +} +.tab.active:before { + border-bottom-right-radius: 4px; + border-width: 0 1px 1px 0; + box-shadow: 2px 2px 0 #424242; + left: -4px; +} +.tab.active:after { + right: -4px; + border-bottom-left-radius: 4px; + border-width: 0 0 1px 1px; + box-shadow: -2px 2px 0 #424242; +} +.tab.active:first-child:before { + display: none; +} + +.tab:hover { + color: #c8c8c8; + background-image: -webkit-linear-gradient(#474747, #444444); +} + +.tab .file-name { + font-size: 11px; + text-shadow: 0 -1px 1px black; +} + +.tab .close-icon { + font-family: 'Octicons Regular'; + font-size: 14px; + width: 14px; + height: 14px; + display: block; + cursor: pointer; + position: absolute; + right: 4px; + top: -1px; + -webkit-font-smoothing: antialiased; +} + +.tab .close-icon:before { + content: "\f081"; +} + +.tab .close-icon:hover { + color: white; +} diff --git a/themes/Atom - Dark/tree-view.css b/themes/Atom - Dark/tree-view.css new file mode 100644 index 000000000..ea27fd587 --- /dev/null +++ b/themes/Atom - Dark/tree-view.css @@ -0,0 +1,179 @@ +.tree-view { + background: #1e1e1e; + border-right: 2px solid #191919; +} + +.tree-view .entry { + text-shadow: 0 -1px 0 #000; +} + +.tree-view .entries { + margin-left: 12px; +} + +.tree-view .entries .file .name { + margin-left: 20px; +} + +.tree-view .directory.selected > .header > .name, +.tree-view .selected > .name { + color: #d2d2d2; +} + +.tree-view .selected > .highlight { + background-image: -webkit-linear-gradient(#4e4e4e, #434343); +} + +.tree-view:focus .selected > .highlight { + background-image: -webkit-linear-gradient(#7e7e7e, #737373); +} + +.tree-view:focus .directory.selected > .header > .name, +.tree-view:focus .selected > .name { + color: #fff; + text-shadow: 0 -1px 0 #7E4521; +} + +.tree-view .directory .header { + color: #bebebe; +} + +.tree-view .file { + color: #7d7d7d; +} + +.tree-view .entry:hover, +.tree-view .directory .header:hover .name, +.tree-view .directory .header:hover .disclosure-arrow { + color: #ebebeb; +} + +.tree-view .file .name, +.tree-view .directory .header { + padding-top: 4px; + padding-bottom: 4px; + padding-right: 10px; +} + +.tree-view .directory .header { + padding-left: 5px; +} + +.tree-view .ignored { + color: #555; +} + +.tree-view .modified { + color: #f78a46; +} + +.tree-view .new { + color: #5293d8; +} + +.tree-view-dialog { + background-color: #333; + border-top: 1px solid #555; + -webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); + padding: 5px; +} + +.tree-view-dialog .prompt { + padding-bottom: 3px; + font-size: 12px; + line-height: 16px; + color: #aaa; +} + +.tree-view-dialog .prompt span { + position: relative; + top: -1px; +} + +.tree-view-dialog .prompt:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 3px; + -webkit-font-smoothing: antialiased; +} + +.tree-view-dialog .prompt.add:before { + content: "\f086"; +} + +.tree-view-dialog .prompt.move:before { + content: "\f03e"; +} + +.tree-view .directory .header .name, +.tree-view .file .name { + position: relative; + padding-left: 21px; +} + +.tree-view .directory .header .name:before, +.tree-view .file .name:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 5px; + -webkit-font-smoothing: antialiased; + position: absolute; + left: 0; +} + +.tree-view .disclosure-arrow:before { + font-family: 'Octicons Regular'; + font-size: 12px; + width: 12px; + height: 12px; + line-height: 16px; + margin-right: 3px; + -webkit-font-smoothing: antialiased; +} + +.tree-view .directory .header .directory-icon:before { + content: "\f016"; + top: -5px; +} + +.tree-view .directory .header .repository-icon:before { + content: "\f001"; + top: -4px; +} + +.tree-view .directory .header .submodule-icon:before { + content: "\f017"; + top: -5px; +} + +.tree-view .file .text-icon:before { + content: "\f011"; + top: -2px; +} + +.tree-view .file .image-icon:before { + content: "\f012"; + top: -2px; +} + +.tree-view .file .compressed-icon:before { + content: "\f013"; + top: -2px; +} + +.tree-view .file .pdf-icon:before { + content: "\f014"; + top: -2px; +} + +.tree-view .directory > .header .disclosure-arrow:before { + content: "\f05a"; +} + +.tree-view .directory.expanded > .header .disclosure-arrow:before { + content: "\f05b"; +} diff --git a/src/packages/wrap-guide/stylesheets/wrap-guide.css b/themes/Atom - Dark/wrap-guide.css similarity index 100% rename from src/packages/wrap-guide/stylesheets/wrap-guide.css rename to themes/Atom - Dark/wrap-guide.css diff --git a/themes/Atom - Light/atom.css b/themes/Atom - Light/atom.css new file mode 100644 index 000000000..772922301 --- /dev/null +++ b/themes/Atom - Light/atom.css @@ -0,0 +1,29 @@ +html, body, +#root-view { + font: caption; + background-color: #f4f4f4; +} + +#root-view #panes .row > * + * { + border-left: 1px solid #989898; +} + +#root-view #panes .column > * + * { + border-top: 1px solid #989898; +} + +.error { + background: #991212 !important; + -webkit-transition: background 300ms ease-out; +} + +.clear-float { + clear: both; +} + +@font-face { + font-family: 'Octicons Regular'; + src: url("octicons-regular-webfont.woff") format("woff"); + font-weight: normal; + font-style: normal; +} diff --git a/themes/Atom - Light/autocomplete.css b/themes/Atom - Light/autocomplete.css new file mode 100644 index 000000000..c121407d0 --- /dev/null +++ b/themes/Atom - Light/autocomplete.css @@ -0,0 +1,16 @@ +.select-list.autocomplete { + min-width: 150px; + webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .5); + margin-left: 0px; + width: auto; +} + +.autocomplete ol { + position: relative; + overflow-y: scroll; + max-height: 200px; +} + +.autocomplete ol li { + padding: 0.1em 0.2em; +} diff --git a/themes/Atom - Light/command-logger.css b/themes/Atom - Light/command-logger.css new file mode 100644 index 000000000..56822c247 --- /dev/null +++ b/themes/Atom - Light/command-logger.css @@ -0,0 +1,41 @@ +.command-logger { + background: #1e1e1e; + color: #eee; + padding-top: 10px; + padding-bottom: 10px; +} + +.command-logger .category-header { + text-align: center; + padding-bottom: 5px; + font-size: 16px; +} + +.command-logger .category-summary { + text-align: center; + padding-bottom: 10px; + font-size: 12px; +} + +.command-logger .tree-map { + margin: auto; + background-color: #efefef; + border: 1px solid #999; +} + +body.command-logger-node-text { + background-color: transparent; +} + +.command-logger-node-text div { + display: table-cell; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + +.command-logger-node-text span { + font-size: 10px; + color: #fff; + text-shadow: #000 1px 1px 4px; +} diff --git a/themes/Atom - Light/command-palette.css b/themes/Atom - Light/command-palette.css new file mode 100644 index 000000000..272b6b806 --- /dev/null +++ b/themes/Atom - Light/command-palette.css @@ -0,0 +1,34 @@ +.command-palette { + width: 50%; + margin-left: -25%; +} + +.command-palette ol { + max-height: 300px; +} + +.command-palette ol .event-description { + float: left; + display: inline-block; + margin-right: .5em; + margin: 4px 0; +} + +.command-palette li .right { + float: right; +} + +.command-palette ol .event-name, .command-palette ol .key-binding { + display: inline-block; + margin: 4px 0; + margin-right: .5em; + font-size: 90%; + color: #969696; + -webkit-border-radius: 3px; + padding: 0 4px; +} + +.command-palette ol .event-name { + background: rgba(0, 0, 0, .2); + color: #fff; +} \ No newline at end of file diff --git a/themes/Atom - Light/command-panel.css b/themes/Atom - Light/command-panel.css new file mode 100644 index 000000000..5344b859d --- /dev/null +++ b/themes/Atom - Light/command-panel.css @@ -0,0 +1,86 @@ +.command-panel { + background-color: #f4f4f4; + border-top: 1px solid #979797; + color: #ededed; + padding: 10px; +} + +.command-panel .preview-list { + max-height: 300px; + overflow: auto; + margin-bottom: 10px; + position: relative; + background-color: #e7e7e7; + color: #222; + cursor: default; + border: 1px solid #989898; +} + +.command-panel .preview-list li.selected, .command-panel .preview-list li.operation:hover { + background-color: rgba(255, 255, 255, .6); +} + +.command-panel .preview-list .path { + padding-left: 5px; + color: #3D5075; +} + +.command-panel .preview-list .path:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 5px; + -webkit-font-smoothing: antialiased; + content: "\f011"; + position: relative; + top: 1px; +} + +.command-panel .preview-list .operation { + padding-top: 2px; + padding-bottom: 2px; +} + +.command-panel .preview-list .line-number { + padding-left: 3px; + color: #3D5075; + margin-right: 1ex; + text-align: right; + display: inline-block; +} + +.command-panel .preview-list .preview { + word-break: break-all; +} + +.command-panel .preview-list .preview .match { + background-color: #c8d4d7; + -webkit-border-radius: 2px; + padding: 1px; +} + +.command-panel .prompt-and-editor { + display: -webkit-box; +} + +.command-panel .prompt-and-editor .prompt:before { + color: #969696; + content: '\f078'; + font-family: 'Octicons Regular'; + position: relative; + top: -4px; + left: -5px; + -webkit-font-smoothing: antialiased; +} + +.command-panel .prompt-and-editor .editor { + position: relative; + left: -4px; + margin-right: -4px; +} + +.error-messages { + padding: 5px 1em; + color: white; +} diff --git a/themes/Atom - Light/editor.css b/themes/Atom - Light/editor.css new file mode 100644 index 000000000..59dcfdfe9 --- /dev/null +++ b/themes/Atom - Light/editor.css @@ -0,0 +1,41 @@ +.editor { + font-family: Inconsolata, Monaco, Courier; +} + +.editor.mini { + height: auto; +} + +.editor .gutter .line-number { + padding-right: 1.3em; + min-width: 35px; + box-sizing: border-box; + text-align: right; +} + +.editor .gutter.drop-shadow { + -webkit-box-shadow: -2px 0px 10px 2px #222; +} + +@-webkit-keyframes highlight { + from { background-color: rgba(100, 255, 100, 0.7); } + to { background-color: null; } +} + +.editor .highlighted.selection .region { + -webkit-animation-name: highlight; + -webkit-animation-duration: 1s; + -webkit-animation-iteration-count: 1; +} + +.editor .fold { + background-color: #444; +} + +.editor .fold.selected { + background-color: #244; +} + +.editor .invisible { + opacity: 0.2; +} diff --git a/themes/Atom - Light/fuzzy-finder.css b/themes/Atom - Light/fuzzy-finder.css new file mode 100644 index 000000000..20cce91b1 --- /dev/null +++ b/themes/Atom - Light/fuzzy-finder.css @@ -0,0 +1,41 @@ +.fuzzy-finder ol { + overflow: hidden; + -webkit-user-select: none; + cursor: default; +} + +.fuzzy-finder ol:empty { + margin-bottom: 0; +} + +.fuzzy-finder .directory { + color: #b2b2b2; + padding-left: .5em; +} + +.fuzzy-finder .file:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 5px; + margin-left: 5px; + -webkit-font-smoothing: antialiased; + color: #9d9d9d; +} + +.fuzzy-finder .file.text-name:before { + content: "\f011"; +} + +.fuzzy-finder .file.image-name:before { + content: "\f012"; +} + +.fuzzy-finder .file.compressed-name:before { + content: "\f013"; +} + +.fuzzy-finder .file.pdf-name:before { + content: "\f014"; +} \ No newline at end of file diff --git a/themes/Atom - Light/grammar-view.css b/themes/Atom - Light/grammar-view.css new file mode 100644 index 000000000..7be94f4c0 --- /dev/null +++ b/themes/Atom - Light/grammar-view.css @@ -0,0 +1,17 @@ +.grammar-view ol li { + line-height: 16px; +} + +.grammar-view ol li.grammar { + padding-left: 21px; +} + +.grammar-view ol li.current-grammar:before { + font-family: 'Octicons Regular'; + width: 16px; + height: 16px; + margin-right: 5px; + -webkit-font-smoothing: antialiased; + color: #ccc; + content: '\f03a'; +} diff --git a/themes/Atom - Light/images/octocat-spinner-128.gif b/themes/Atom - Light/images/octocat-spinner-128.gif new file mode 100644 index 000000000..9e8e12916 Binary files /dev/null and b/themes/Atom - Light/images/octocat-spinner-128.gif differ diff --git a/themes/Atom - Light/markdown-preview.css b/themes/Atom - Light/markdown-preview.css new file mode 100644 index 000000000..f5274f2df --- /dev/null +++ b/themes/Atom - Light/markdown-preview.css @@ -0,0 +1,438 @@ +.markdown-preview { + position: absolute; + width: 100%; + height: 100%; + top: 0px; + left: 0px; + background-color: #F4F4F4; + overflow: auto; + z-index: 3; + box-sizing: border-box; + padding: 20px; +} + +.markdown-body { + background-color: #fff; + box-shadow: rgba(0, 0, 0, 0.1) 0 0 0 1px,rgba(0, 0, 0, 0.3) 0 1px 3px; + border-radius: 5px; + max-width: 914px; + min-width: 680px; + margin-left: auto; + margin-right: auto; + padding: 30px; +} + +.markdown-body pre, +.markdown-body code, +.markdown-body tt { + font-size: 12px; + font-family: Consolas, "Liberation Mono", Courier, monospace; +} + +.markdown-body ol > li { + list-style-type: decimal; +} + +.markdown-body ul > li { + list-style-type: disc; +} + +.markdown-spinner { + margin: auto; + background-image: url(images/octocat-spinner-128.gif); + background-repeat: no-repeat; + background-size: 64px; + background-position: top center; + padding-top: 70px; + text-align: center; +} + + +/* this code below was copied from https://github.com/assets/stylesheets/primer/components/markdown.css */ +/* we really need to get primer in here somehow. */ +.markdown-body { + font-size: 14px; + line-height: 1.6; + overflow: hidden; } + .markdown-body > *:first-child { + margin-top: 0 !important; } + .markdown-body > *:last-child { + margin-bottom: 0 !important; } + .markdown-body a.absent { + color: #c00; } + .markdown-body a.anchor { + display: block; + padding-left: 30px; + margin-left: -30px; + cursor: pointer; + position: absolute; + top: 0; + left: 0; + bottom: 0; } + .markdown-body h1, .markdown-body h2, .markdown-body h3, .markdown-body h4, .markdown-body h5, .markdown-body h6 { + margin: 20px 0 10px; + padding: 0; + font-weight: bold; + -webkit-font-smoothing: antialiased; + cursor: text; + position: relative; } + .markdown-body h1 .mini-icon-link, .markdown-body h2 .mini-icon-link, .markdown-body h3 .mini-icon-link, .markdown-body h4 .mini-icon-link, .markdown-body h5 .mini-icon-link, .markdown-body h6 .mini-icon-link { + display: none; + color: #000; } + .markdown-body h1:hover a.anchor, .markdown-body h2:hover a.anchor, .markdown-body h3:hover a.anchor, .markdown-body h4:hover a.anchor, .markdown-body h5:hover a.anchor, .markdown-body h6:hover a.anchor { + text-decoration: none; + line-height: 1; + padding-left: 0; + margin-left: -22px; + top: 15%; } + .markdown-body h1:hover a.anchor .mini-icon-link, .markdown-body h2:hover a.anchor .mini-icon-link, .markdown-body h3:hover a.anchor .mini-icon-link, .markdown-body h4:hover a.anchor .mini-icon-link, .markdown-body h5:hover a.anchor .mini-icon-link, .markdown-body h6:hover a.anchor .mini-icon-link { + display: inline-block; } + .markdown-body h1 tt, .markdown-body h1 code, .markdown-body h2 tt, .markdown-body h2 code, .markdown-body h3 tt, .markdown-body h3 code, .markdown-body h4 tt, .markdown-body h4 code, .markdown-body h5 tt, .markdown-body h5 code, .markdown-body h6 tt, .markdown-body h6 code { + font-size: inherit; } + .markdown-body h1 { + font-size: 28px; + color: #000; } + .markdown-body h2 { + font-size: 24px; + border-bottom: 1px solid #ccc; + color: #000; } + .markdown-body h3 { + font-size: 18px; } + .markdown-body h4 { + font-size: 16px; } + .markdown-body h5 { + font-size: 14px; } + .markdown-body h6 { + color: #777; + font-size: 14px; } + .markdown-body p, + .markdown-body blockquote, + .markdown-body ul, .markdown-body ol, .markdown-body dl, + .markdown-body table, + .markdown-body pre { + margin: 15px 0; } + .markdown-body hr { + background: transparent url("https://a248.e.akamai.net/assets.github.com/assets/primer/markdown/dirty-shade-0e7d81b119cc9beae17b0c98093d121fa0050a74.png") repeat-x 0 0; + border: 0 none; + color: #ccc; + height: 4px; + padding: 0; } + .markdown-body > h2:first-child, .markdown-body > h1:first-child, .markdown-body > h1:first-child + h2, .markdown-body > h3:first-child, .markdown-body > h4:first-child, .markdown-body > h5:first-child, .markdown-body > h6:first-child { + margin-top: 0; + padding-top: 0; } + .markdown-body a:first-child h1, .markdown-body a:first-child h2, .markdown-body a:first-child h3, .markdown-body a:first-child h4, .markdown-body a:first-child h5, .markdown-body a:first-child h6 { + margin-top: 0; + padding-top: 0; } + .markdown-body h1 + p, + .markdown-body h2 + p, + .markdown-body h3 + p, + .markdown-body h4 + p, + .markdown-body h5 + p, + .markdown-body h6 + p { + margin-top: 0; } + .markdown-body li p.first { + display: inline-block; } + .markdown-body ul, .markdown-body ol { + padding-left: 30px; } + .markdown-body ul.no-list, .markdown-body ol.no-list { + list-style-type: none; + padding: 0; } + .markdown-body ul li > :first-child, + .markdown-body ul li ul:first-of-type, .markdown-body ol li > :first-child, + .markdown-body ol li ul:first-of-type { + margin-top: 0px; } + .markdown-body ul ul, + .markdown-body ul ol, + .markdown-body ol ol, + .markdown-body ol ul { + margin-bottom: 0; } + .markdown-body dl { + padding: 0; } + .markdown-body dl dt { + font-size: 14px; + font-weight: bold; + font-style: italic; + padding: 0; + margin: 15px 0 5px; } + .markdown-body dl dt:first-child { + padding: 0; } + .markdown-body dl dt > :first-child { + margin-top: 0px; } + .markdown-body dl dt > :last-child { + margin-bottom: 0px; } + .markdown-body dl dd { + margin: 0 0 15px; + padding: 0 15px; } + .markdown-body dl dd > :first-child { + margin-top: 0px; } + .markdown-body dl dd > :last-child { + margin-bottom: 0px; } + .markdown-body blockquote { + border-left: 4px solid #DDD; + padding: 0 15px; + color: #777; } + .markdown-body blockquote > :first-child { + margin-top: 0px; } + .markdown-body blockquote > :last-child { + margin-bottom: 0px; } + .markdown-body table th { + font-weight: bold; } + .markdown-body table th, .markdown-body table td { + border: 1px solid #ccc; + padding: 6px 13px; } + .markdown-body table tr { + border-top: 1px solid #ccc; + background-color: #fff; } + .markdown-body table tr:nth-child(2n) { + background-color: #f8f8f8; } + .markdown-body img { + max-width: 100%; + -moz-box-sizing: border-box; + box-sizing: border-box; } + .markdown-body span.frame { + display: block; + overflow: hidden; } + .markdown-body span.frame > span { + border: 1px solid #ddd; + display: block; + float: left; + overflow: hidden; + margin: 13px 0 0; + padding: 7px; + width: auto; } + .markdown-body span.frame span img { + display: block; + float: left; } + .markdown-body span.frame span span { + clear: both; + color: #333; + display: block; + padding: 5px 0 0; } + .markdown-body span.align-center { + display: block; + overflow: hidden; + clear: both; } + .markdown-body span.align-center > span { + display: block; + overflow: hidden; + margin: 13px auto 0; + text-align: center; } + .markdown-body span.align-center span img { + margin: 0 auto; + text-align: center; } + .markdown-body span.align-right { + display: block; + overflow: hidden; + clear: both; } + .markdown-body span.align-right > span { + display: block; + overflow: hidden; + margin: 13px 0 0; + text-align: right; } + .markdown-body span.align-right span img { + margin: 0; + text-align: right; } + .markdown-body span.float-left { + display: block; + margin-right: 13px; + overflow: hidden; + float: left; } + .markdown-body span.float-left span { + margin: 13px 0 0; } + .markdown-body span.float-right { + display: block; + margin-left: 13px; + overflow: hidden; + float: right; } + .markdown-body span.float-right > span { + display: block; + overflow: hidden; + margin: 13px auto 0; + text-align: right; } + .markdown-body code, .markdown-body tt { + margin: 0 2px; + padding: 0px 5px; + border: 1px solid #eaeaea; + background-color: #f8f8f8; + border-radius: 3px; } + .markdown-body code { + white-space: nowrap; } + .markdown-body pre > code { + margin: 0; + padding: 0; + white-space: pre; + border: none; + background: transparent; } + .markdown-body .highlight pre, .markdown-body pre { + background-color: #f8f8f8; + border: 1px solid #ccc; + font-size: 13px; + line-height: 19px; + overflow: auto; + padding: 6px 10px; + border-radius: 3px; } + .markdown-body pre code, .markdown-body pre tt { + margin: 0; + padding: 0; + background-color: transparent; + border: none; } + +/* this code was copied from https://github.com/assets/stylesheets/primer/components/pygments.css */ +/* the .markdown-body class was then added to all rules */ +.markdown-body .highlight { + background: #ffffff; } + .markdown-body .highlight .c { + color: #999988; + font-style: italic; } + .markdown-body .highlight .err { + color: #a61717; + background-color: #e3d2d2; } + .markdown-body .highlight .k { + font-weight: bold; } + .markdown-body .highlight .o { + font-weight: bold; } + .markdown-body .highlight .cm { + color: #999988; + font-style: italic; } + .markdown-body .highlight .cp { + color: #999999; + font-weight: bold; } + .markdown-body .highlight .c1 { + color: #999988; + font-style: italic; } + .markdown-body .highlight .cs { + color: #999999; + font-weight: bold; + font-style: italic; } + .markdown-body .highlight .gd { + color: #000000; + background-color: #ffdddd; } + .markdown-body .highlight .gd .x { + color: #000000; + background-color: #ffaaaa; } + .markdown-body .highlight .ge { + font-style: italic; } + .markdown-body .highlight .gr { + color: #aa0000; } + .markdown-body .highlight .gh { + color: #999999; } + .markdown-body .highlight .gi { + color: #000000; + background-color: #ddffdd; } + .markdown-body .highlight .gi .x { + color: #000000; + background-color: #aaffaa; } + .markdown-body .highlight .go { + color: #888888; } + .markdown-body .highlight .gp { + color: #555555; } + .markdown-body .highlight .gs { + font-weight: bold; } + .markdown-body .highlight .gu { + color: #800080; + font-weight: bold; } + .markdown-body .highlight .gt { + color: #aa0000; } + .markdown-body .highlight .kc { + font-weight: bold; } + .markdown-body .highlight .kd { + font-weight: bold; } + .markdown-body .highlight .kn { + font-weight: bold; } + .markdown-body .highlight .kp { + font-weight: bold; } + .markdown-body .highlight .kr { + font-weight: bold; } + .markdown-body .highlight .kt { + color: #445588; + font-weight: bold; } + .markdown-body .highlight .m { + color: #009999; } + .markdown-body .highlight .s { + color: #d14; } + .markdown-body .highlight .na { + color: #008080; } + .markdown-body .highlight .nb { + color: #0086B3; } + .markdown-body .highlight .nc { + color: #445588; + font-weight: bold; } + .markdown-body .highlight .no { + color: #008080; } + .markdown-body .highlight .ni { + color: #800080; } + .markdown-body .highlight .ne { + color: #990000; + font-weight: bold; } + .markdown-body .highlight .nf { + color: #990000; + font-weight: bold; } + .markdown-body .highlight .nn { + color: #555555; } + .markdown-body .highlight .nt { + color: #000080; } + .markdown-body .highlight .nv { + color: #008080; } + .markdown-body .highlight .ow { + font-weight: bold; } + .markdown-body .highlight .w { + color: #bbbbbb; } + .markdown-body .highlight .mf { + color: #009999; } + .markdown-body .highlight .mh { + color: #009999; } + .markdown-body .highlight .mi { + color: #009999; } + .markdown-body .highlight .mo { + color: #009999; } + .markdown-body .highlight .sb { + color: #d14; } + .markdown-body .highlight .sc { + color: #d14; } + .markdown-body .highlight .sd { + color: #d14; } + .markdown-body .highlight .s2 { + color: #d14; } + .markdown-body .highlight .se { + color: #d14; } + .markdown-body .highlight .sh { + color: #d14; } + .markdown-body .highlight .si { + color: #d14; } + .markdown-body .highlight .sx { + color: #d14; } + .markdown-body .highlight .sr { + color: #009926; } + .markdown-body .highlight .s1 { + color: #d14; } + .markdown-body .highlight .ss { + color: #990073; } + .markdown-body .highlight .bp { + color: #999999; } + .markdown-body .highlight .vc { + color: #008080; } + .markdown-body .highlight .vg { + color: #008080; } + .markdown-body .highlight .vi { + color: #008080; } + .markdown-body .highlight .il { + color: #009999; } + .markdown-body .highlight .gc { + color: #999; + background-color: #EAF2F5; } + +.type-csharp .markdown-body .highlight .k { + color: #0000FF; } +.type-csharp .markdown-body .highlight .kt { + color: #0000FF; } +.type-csharp .markdown-body .highlight .nf { + color: #000000; + font-weight: normal; } +.type-csharp .markdown-body .highlight .nc { + color: #2B91AF; } +.type-csharp .markdown-body .highlight .nn { + color: #000000; } +.type-csharp .markdown-body .highlight .s { + color: #A31515; } +.type-csharp .markdown-body .highlight .sc { + color: #A31515; } diff --git a/themes/Atom - Light/outline-view.css b/themes/Atom - Light/outline-view.css new file mode 100644 index 000000000..a5146bc38 --- /dev/null +++ b/themes/Atom - Light/outline-view.css @@ -0,0 +1,35 @@ +.outline-view { + width: 50%; + margin-left: -25%; +} + +.outline-view ol { + max-height: 300px; +} + +.outline-view ol li { + padding: 2px; + border-bottom: 1px solid rgba(255, 255, 255, .05); +} + +.outline-view ol .function-name { + float: left; + display: inline-block; + margin-right: .5em; + margin: 4px 0; +} + +.outline-view li .right { + float: right; +} + +.outline-view ol .function-details { + display: inline-block; + margin: 4px 0; + margin-right: .5em; + font-size: 90%; + color: #ddd; + -webkit-border-radius: 3px; + padding: 0 4px; + background: rgba(0, 0, 0, .2); +} diff --git a/themes/Atom - Light/package.json b/themes/Atom - Light/package.json new file mode 100644 index 000000000..9e58cbdb7 --- /dev/null +++ b/themes/Atom - Light/package.json @@ -0,0 +1,19 @@ +{ + "stylesheets":[ + "atom.css", + "editor.css", + "grammar-view.css", + "select-list.css", + "tree-view.css", + "tabs.css", + "wrap-guide.css", + "status-bar.css", + "outline-view.css", + "markdown-preview.css", + "fuzzy-finder.css", + "command-panel.css", + "command-palette.css", + "command-logger.css", + "autocomplete.css" + ] +} \ No newline at end of file diff --git a/themes/Atom - Light/select-list.css b/themes/Atom - Light/select-list.css new file mode 100644 index 000000000..8a2752359 --- /dev/null +++ b/themes/Atom - Light/select-list.css @@ -0,0 +1,46 @@ +.select-list { + background-color: #eeeeee; + border: 1px solid #c6c6c6; + color: #323232; + box-shadow: 0 0 10px #555; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + padding: 5px; + cursor: pointer; +} + +.select-list .editor { + border: 1px solid #afafaf; + box-shadow: inset 0 0 2px #ccc; +} + +.select-list ol { + border: 1px solid #d2d2d2; +} + +.select-list ol li { + background-color: #f5f5f5; + border-bottom: 1px solid #e6e6e6; + padding: 5px; +} + +.select-list ol li:last-child { + border-bottom: none; +} + +.select-list .editor { + margin-bottom: 5px; +} + +.select-list li:hover { + background-color: #f9f9f9; +} + +.select-list ol .selected { + background-color: #e1e1e1; +} + +.select-list .error { + padding-top: 5px; + font-weight: bold; +} \ No newline at end of file diff --git a/themes/Atom - Light/status-bar.css b/themes/Atom - Light/status-bar.css new file mode 100644 index 000000000..88995cd78 --- /dev/null +++ b/themes/Atom - Light/status-bar.css @@ -0,0 +1,61 @@ +.status-bar { + background-color: #e5e5e5; + border-top: 1px solid #959595; + padding: 4px 10px 3px; + font-size: 11px; + line-height: 14px; + color: #333; +} + +.status-bar .cursor-position, +.status-bar .grammar-name { + padding-left: 10px; +} + +.status-bar .grammar-name { + cursor: pointer; +} + +.status-bar .branch-label { + vertical-align: baseline; +} + +.status-bar .git-status.octicons { + display: none; + padding-left: 10px; + margin-top:-2px; +} + +.status-bar .octicons:before { + font-family: 'Octicons Regular'; + font-size: 14px; + width: 14px; + height: 14px; + line-height: 14px; + -webkit-font-smoothing: antialiased; + display: inline-block; + vertical-align: middle; + margin-right: 5px; +} + +.status-bar .branch-icon:before { + content: "\f020"; +} + +.status-bar .git-status.octicons.modified-status-icon { + color: #f78a46; + display: inline-block; +} + +.status-bar .modified-status-icon:before { + content: "\f26d"; +} + +.status-bar .git-status.octicons.new-status-icon { + color: #5293d8; + display: inline-block; +} + +.status-bar .new-status-icon:before { + content: "\f26b"; +} diff --git a/themes/Atom - Light/tabs.css b/themes/Atom - Light/tabs.css new file mode 100644 index 000000000..d2f706da5 --- /dev/null +++ b/themes/Atom - Light/tabs.css @@ -0,0 +1,120 @@ +.tabs { + background: #e3e3e3; + border-bottom: 4px solid #e5e5e5; + font: caption; + box-shadow: inset 0 -1px 0 #959595; +} + +.tab { + cursor: default; + padding: 2px 21px 2px 9px; + background-image: -webkit-linear-gradient(#e0e0e0, #bfbfbf); + border-top: none; + border-right: 1px solid #959595; + border-bottom: 1px solid #959595; + box-shadow: inset 0 0 5px #eee, 0 1px 0 #eee, inset -1px 0 0 #e0e0e0, inset 1px 0 0 #e0e0e0; + color: #323232; +} + +.tab:hover { + background-image: -webkit-linear-gradient(#e2e2e2, #e0e0e0); +} + +.tab .close-icon { + color: rgba(0,0,0,0.3); +} + +.tab.file-modified .close-icon { + border-color: #aaa; +} + +.tab.active, +.tab.active:hover { + color: #010101; +} + +.tab.active:first-child, +.tab.active:first-child:hover { + box-shadow: none; +} + +.tab.file-modified.active .close-icon { + border-color: #e6e6e6; +} + +.tab:hover .close-icon { + color: #c8c8c8; + border-color: #c8c8c8; +} + +.tab.file-modified .close-icon { + border: 3px solid #777; + border-radius: 10px; +} + +.tab.file-modified .close-icon:before { + content: ""; +} + +.tab.active, +.tab.active:hover { + border-bottom: 0 none; + box-shadow: inset -1px 0 0 #e0e0e0, inset 1px 0 0 #e0e0e0; + background-image: -webkit-linear-gradient(#fefefe, #e7e6e7); +} + +.tab.active:before, +.tab.active:after { + position: absolute; + bottom: 0; + width: 4px; + height: 4px; + content: " "; + z-index: 3; + border: 1px solid #959595; +} +.tab.active:before { + border-bottom-right-radius: 4px; + border-width: 0 1px 1px 0; + box-shadow: 2px 2px 0 #e5e5e5; + left: -5px; +} +.tab.active:after { + right: -5px; + border-bottom-left-radius: 4px; + border-width: 0 0 1px 1px; + box-shadow: -2px 2px 0 #e5e5e5; +} +.tab.active:first-child:before { + display: none; +} + +.tab:hover { + background-image: -webkit-linear-gradient(#e2e2e2, #e0e0e0); +} + +.tab .file-name { + font-size: 11px; + text-shadow: 0 1px 0 #e0e0e0; +} + +.tab .close-icon { + font-family: 'Octicons Regular'; + font-size: 14px; + width: 14px; + height: 14px; + display: block; + cursor: pointer; + position: absolute; + right: 4px; + top: -1px; + -webkit-font-smoothing: antialiased; +} + +.tab .close-icon:before { + content: "\f081"; +} + +.tab .close-icon:hover { + color: #aaa; +} diff --git a/themes/Atom - Light/tree-view.css b/themes/Atom - Light/tree-view.css new file mode 100644 index 000000000..c0f599fc2 --- /dev/null +++ b/themes/Atom - Light/tree-view.css @@ -0,0 +1,201 @@ +.tree-view { + background: #dde3e8; + border-right: 1px solid #989898; +} + +.tree-view .entry { + text-shadow: 0 1px 0 #fff; +} + +.tree-view .entries { + margin-left: 12px; +} + +.tree-view .entries .file .name { + margin-left: 20px; +} + +.tree-view .directory.selected > .header > .name, +.tree-view .selected > .name { + color: #262626; +} + +.tree-view .selected > .highlight { + box-sizing: border-box; + border-top: 1px solid #97a4a7; + border-bottom: 1px solid #97a4a7; + box-shadow: 0 -1px 0 #dde4e6, 0 1px 0 #dde4e6; + background-image: -webkit-linear-gradient(#cad5d8, #bcccce); +} + +.tree-view:focus .selected > .highlight { + border-top: 1px solid #3D4552; + border-bottom: 1px solid #3D4552; + background-image: -webkit-linear-gradient(#7e868d, #69717b); +} + +.tree-view:focus .directory.selected > .header > .name, +.tree-view:focus .selected > .name, +.tree-view:focus .directory.selected > .header > .name:before, +.tree-view:focus .selected > .name:before { + color: #fff; + text-shadow: 0 1px 0 #000; +} + +.tree-view .directory .header { + color: #262626; +} + +.tree-view .file { + color: #262626; +} + +.tree-view .name:before { + color: #7e8692; +} + +.tree-view .entry:hover, +.tree-view .directory .header:hover .name, +.tree-view .directory .header:hover .disclosure-arrow { + color: #4e5666; +} + +.tree-view .directory .header .disclosure-arrow, +.tree-view .directory .header:hover .disclosure-arrow { + text-shadow: none; + color: #4e5666; +} + +.tree-view:focus .directory .header .disclosure-arrow, +.tree-view:focus .directory .header:hover .disclosure-arrow { + color: #3D4552; +} + +.tree-view .file .name, +.tree-view .directory .header { + padding-top: 4px; + padding-bottom: 4px; + padding-right: 10px; +} + +.tree-view .directory .header { + padding-left: 5px; +} + +.tree-view .ignored { + color: #555; +} + +.tree-view .modified { + color: #f78a46; +} + +.tree-view .new { + color: #5293d8; +} + +.tree-view-dialog { + background-color: #e7e7e7; + border-top: 1px solid #989898; + padding: 5px; +} + +.tree-view-dialog .prompt { + padding-bottom: 3px; + font-size: 12px; + line-height: 16px; + color: #333; +} + +.tree-view-dialog .prompt span { + position: relative; + top: -1px; +} + +.tree-view-dialog .prompt:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 3px; + -webkit-font-smoothing: antialiased; +} + +.tree-view-dialog .prompt.add:before { + content: "\f086"; +} + +.tree-view-dialog .prompt.move:before { + content: "\f03e"; +} + +.tree-view .directory .header .name, +.tree-view .file .name { + position: relative; + padding-left: 21px; +} + +.tree-view .directory .header .name:before, +.tree-view .file .name:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 5px; + -webkit-font-smoothing: antialiased; + position: absolute; + left: 0; +} + +.tree-view .disclosure-arrow:before { + font-family: 'Octicons Regular'; + font-size: 12px; + width: 12px; + height: 12px; + line-height: 16px; + margin-right: 3px; + -webkit-font-smoothing: antialiased; +} + +.tree-view .directory .header .directory-icon:before { + content: "\f016"; + top: -5px; +} + +.tree-view .directory .header .repository-icon:before { + content: "\f001"; + top: -4px; +} + +.tree-view .directory .header .submodule-icon:before { + content: "\f017"; + top: -5px; +} + +.tree-view .file .text-icon:before { + content: "\f011"; + top: -2px; +} + +.tree-view .file .image-icon:before { + content: "\f012"; + top: -2px; +} + +.tree-view .file .compressed-icon:before { + content: "\f013"; + top: -2px; +} + +.tree-view .file .pdf-icon:before { + content: "\f014"; + top: -2px; +} + +.tree-view .directory > .header .disclosure-arrow:before { + content: "\f05a"; +} + +.tree-view .directory.expanded > .header .disclosure-arrow:before { + content: "\f05b"; +} diff --git a/themes/Atom - Light/wrap-guide.css b/themes/Atom - Light/wrap-guide.css new file mode 100644 index 000000000..9f93ee19e --- /dev/null +++ b/themes/Atom - Light/wrap-guide.css @@ -0,0 +1,8 @@ +.wrap-guide { + height: 100%; + width: 1px; + background: rgba(150, 150, 150, .30); + z-index: 100; + position: absolute; + top: 0px; +} diff --git a/themes/IR_Black.tmTheme b/themes/IR_Black.tmTheme deleted file mode 100644 index cbc18d0b9..000000000 --- a/themes/IR_Black.tmTheme +++ /dev/null @@ -1,810 +0,0 @@ - - - - - name - IR_Black - settings - - - settings - - background - #000000 - caret - #FFFFFF - foreground - #EDEDED - invisibles - #CAE2FB3D - lineHighlight - #FFFFFF24 - selection - #333333 - - - - name - Comment - scope - comment - settings - - fontStyle - - foreground - #7C7C7C - - - - name - Entity - scope - entity - settings - - fontStyle - - foreground - #FFD2A7 - - - - name - Keyword - scope - keyword - settings - - fontStyle - - foreground - #96CBFE - - - - name - Keyword.control - scope - keyword.control - settings - - fontStyle - - foreground - #96CBFE - - - - name - Keyword.Operator - scope - keyword.operator - settings - - foreground - #EDEDED - - - - name - Class - scope - entity.name.type - settings - - fontStyle - underline - foreground - #FFFFB6 - - - - name - Support - scope - support - settings - - fontStyle - - foreground - #FFFFB6 - - - - name - Storage - scope - storage - settings - - fontStyle - - foreground - #CFCB90 - - - - name - Storage.modifier - scope - storage.modifier - settings - - fontStyle - - foreground - #96CBFE - - - - name - Constant - scope - constant - settings - - fontStyle - - foreground - #99CC99 - - - - name - String - scope - string - settings - - fontStyle - bold - foreground - #A8FF60 - - - - name - Number - scope - constant.numeric - settings - - fontStyle - bold - foreground - #FF73FD - - - - name - Punctuation - scope - punctuation - settings - - fontStyle - - - - - name - Variable - scope - variable - settings - - fontStyle - - foreground - #C6C5FE - - - - name - Invalid – Deprecated - scope - invalid.deprecated - settings - - fontStyle - italic underline - foreground - #FD5FF1 - - - - name - Invalid – Illegal - scope - invalid.illegal - settings - - background - #562D56BF - foreground - #FD5FF1 - - - - name - ----------------------------------- - settings - - - - name - ♦ Embedded Source (Bright) - scope - text source - settings - - background - #B1B3BA08 - fontStyle - - - - - name - ♦ Entity inherited-class - scope - entity.other.inherited-class - settings - - fontStyle - italic - foreground - #9B5C2E - - - - name - ♦ String embedded-variable - scope - source string source - settings - - fontStyle - - foreground - #EDEDED - - - - name - ♦ String punctuation - scope - source string source punctuation.section.embedded - settings - - fontStyle - - foreground - #00A0A0 - - - - name - ♦ String constant - scope - string constant - settings - - fontStyle - - foreground - #00A0A0 - - - - name - ♦ String.regexp - scope - string.regexp - settings - - foreground - #E9C062 - - - - name - ♦ String.regexp.«special» - scope - string.regexp constant.character.escape, string.regexp source.ruby.embedded, string.regexp string.regexp.arbitrary-repitition - settings - - fontStyle - - foreground - #FF8000 - - - - name - ♦ String.regexp.group - scope - string.regexp.group - settings - - background - #FFFFFF0F - fontStyle - - foreground - #C6A24F - - - - name - ♦ String.regexp.character-class - scope - string.regexp.character-class - settings - - fontStyle - - foreground - #B18A3D - - - - name - ♦ String variable - scope - string variable - settings - - fontStyle - - foreground - #8A9A95 - - - - name - ♦ Support.function - scope - support.function - settings - - fontStyle - - foreground - #DAD085 - - - - name - ♦ Support.constant - scope - support.constant - settings - - fontStyle - - foreground - #FFD2A7 - - - - name - c C/C++ Preprocessor Line - scope - meta.preprocessor.c - settings - - foreground - #8996A8 - - - - name - c C/C++ Preprocessor Directive - scope - meta.preprocessor.c keyword - settings - - fontStyle - - foreground - #AFC4DB - - - - name - j Cast - scope - meta.cast - settings - - fontStyle - italic - foreground - #676767 - - - - name - ✘ Doctype/XML Processing - scope - meta.sgml.html meta.doctype, meta.sgml.html meta.doctype entity, meta.sgml.html meta.doctype string, meta.xml-processing, meta.xml-processing entity, meta.xml-processing string - settings - - foreground - #494949 - - - - name - ✘ Meta.tag.«all» - scope - meta.tag, meta.tag entity - settings - - fontStyle - bold - foreground - #96CBFE - - - - name - ✘ Meta.tag.inline - scope - source entity.name.tag, source entity.other.attribute-name, meta.tag.inline, meta.tag.inline entity - settings - - fontStyle - - foreground - #96CBFE - - - - name - ✘ Meta.tag.attribute-name - scope - entity.other.attribute-name - settings - - fontStyle - - foreground - #FFD7B1 - - - - name - ✘ Namespaces - scope - entity.name.tag.namespace, entity.other.attribute-name.namespace - settings - - fontStyle - - foreground - #E18964 - - - - name - § css tag-name - scope - meta.selector.css entity.name.tag - settings - - fontStyle - underline - foreground - #96CBFE - - - - name - § css:pseudo-class - scope - meta.selector.css entity.other.attribute-name.tag.pseudo-class - settings - - fontStyle - - foreground - #8F9D6A - - - - name - § css#id - scope - meta.selector.css entity.other.attribute-name.id - settings - - fontStyle - - foreground - #8B98AB - - - - name - § css.class - scope - meta.selector.css entity.other.attribute-name.class - settings - - fontStyle - - foreground - #62B1FE - - - - name - § css property-name: - scope - support.type.property-name.css - settings - - foreground - #EDEDED - - - - name - § css property-value; - scope - meta.property-group support.constant.property-value.css, meta.property-value support.constant.property-value.css - settings - - fontStyle - - foreground - #F9EE98 - - - - name - § css @at-rule - scope - meta.preprocessor.at-rule keyword.control.at-rule - settings - - foreground - #8693A5 - - - - name - § css additional-constants - scope - meta.property-value support.constant.named-color.css, meta.property-value constant - settings - - fontStyle - - foreground - #87C38A - - - - name - § css constructor.argument - scope - meta.constructor.argument.css - settings - - foreground - #8F9D6A - - - - name - ⎇ diff.header - scope - meta.diff, meta.diff.header - settings - - background - #0E2231 - fontStyle - italic - foreground - #F8F8F8 - - - - name - ⎇ diff.deleted - scope - markup.deleted - settings - - background - #420E09 - foreground - #F8F8F8 - - - - name - ⎇ diff.changed - scope - markup.changed - settings - - background - #4A410D - foreground - #F8F8F8 - - - - name - ⎇ diff.inserted - scope - markup.inserted - settings - - background - #253B22 - foreground - #F8F8F8 - - - - name - -------------------------------- - settings - - - - name - Markup: Italic - scope - markup.italic - settings - - fontStyle - italic - foreground - #E9C062 - - - - name - Markup: Bold - scope - markup.bold - settings - - fontStyle - bold - foreground - #E9C062 - - - - name - Markup: Underline - scope - markup.underline - settings - - fontStyle - underline - foreground - #E18964 - - - - name - Markup: Quote - scope - markup.quote - settings - - background - #FEE09C12 - fontStyle - italic - foreground - #E1D4B9 - - - - name - Markup: Heading - scope - markup.heading, markup.heading entity - settings - - background - #632D04 - fontStyle - - foreground - #FEDCC5 - - - - name - Markup: List - scope - markup.list - settings - - foreground - #E1D4B9 - - - - name - Markup: Raw - scope - markup.raw - settings - - background - #B1B3BA08 - fontStyle - - foreground - #578BB3 - - - - name - Markup: Comment - scope - markup comment - settings - - fontStyle - italic - foreground - #F67B37 - - - - name - Markup: Separator - scope - meta.separator - settings - - background - #242424 - foreground - #60A633 - - - - name - Log Entry - scope - meta.line.entry.logfile, meta.line.exit.logfile - settings - - background - #EEEEEE29 - - - - name - Log Entry Error - scope - meta.line.error.logfile - settings - - background - #751012 - - - - uuid - D039AEA9-9DD2-4237-A963-E84494B0B3FB - - diff --git a/themes/All Hallow's Eve.tmTheme b/vendor/themes/All Hallow's Eve.tmTheme similarity index 100% rename from themes/All Hallow's Eve.tmTheme rename to vendor/themes/All Hallow's Eve.tmTheme diff --git a/themes/Amy.tmTheme b/vendor/themes/Amy.tmTheme similarity index 100% rename from themes/Amy.tmTheme rename to vendor/themes/Amy.tmTheme diff --git a/themes/Blackboard.tmTheme b/vendor/themes/Blackboard.tmTheme similarity index 100% rename from themes/Blackboard.tmTheme rename to vendor/themes/Blackboard.tmTheme diff --git a/themes/Brilliance Black.tmTheme b/vendor/themes/Brilliance Black.tmTheme similarity index 100% rename from themes/Brilliance Black.tmTheme rename to vendor/themes/Brilliance Black.tmTheme diff --git a/themes/Brilliance Dull.tmTheme b/vendor/themes/Brilliance Dull.tmTheme similarity index 100% rename from themes/Brilliance Dull.tmTheme rename to vendor/themes/Brilliance Dull.tmTheme diff --git a/themes/Cobalt.tmTheme b/vendor/themes/Cobalt.tmTheme similarity index 100% rename from themes/Cobalt.tmTheme rename to vendor/themes/Cobalt.tmTheme diff --git a/themes/Dawn.tmTheme b/vendor/themes/Dawn.tmTheme similarity index 100% rename from themes/Dawn.tmTheme rename to vendor/themes/Dawn.tmTheme diff --git a/themes/Espresso Libre.tmTheme b/vendor/themes/Espresso Libre.tmTheme similarity index 100% rename from themes/Espresso Libre.tmTheme rename to vendor/themes/Espresso Libre.tmTheme diff --git a/themes/IDLE.tmTheme b/vendor/themes/IDLE.tmTheme similarity index 100% rename from themes/IDLE.tmTheme rename to vendor/themes/IDLE.tmTheme diff --git a/.atom/themes/IR_Black.tmTheme b/vendor/themes/IR_Black.tmTheme similarity index 100% rename from .atom/themes/IR_Black.tmTheme rename to vendor/themes/IR_Black.tmTheme diff --git a/themes/LAZY.tmTheme b/vendor/themes/LAZY.tmTheme similarity index 100% rename from themes/LAZY.tmTheme rename to vendor/themes/LAZY.tmTheme diff --git a/themes/Mac Classic.tmTheme b/vendor/themes/Mac Classic.tmTheme similarity index 100% rename from themes/Mac Classic.tmTheme rename to vendor/themes/Mac Classic.tmTheme diff --git a/themes/MagicWB (Amiga).tmTheme b/vendor/themes/MagicWB (Amiga).tmTheme similarity index 100% rename from themes/MagicWB (Amiga).tmTheme rename to vendor/themes/MagicWB (Amiga).tmTheme diff --git a/vendor/themes/Monokai.tmTheme b/vendor/themes/Monokai.tmTheme new file mode 100755 index 000000000..496ef6c2a --- /dev/null +++ b/vendor/themes/Monokai.tmTheme @@ -0,0 +1,289 @@ + + + + + name + Monokai + settings + + + settings + + background + #272822 + caret + #F8F8F0 + foreground + #F8F8F2 + invisibles + #3B3A32 + lineHighlight + #3E3D32 + selection + #49483E + + + + name + Comment + scope + comment + settings + + foreground + #75715E + + + + name + String + scope + string + settings + + foreground + #E6DB74 + + + + name + Number + scope + constant.numeric + settings + + foreground + #AE81FF + + + + name + Built-in constant + scope + constant.language + settings + + foreground + #AE81FF + + + + name + User-defined constant + scope + constant.character, constant.other + settings + + foreground + #AE81FF + + + + name + Variable + scope + variable + settings + + fontStyle + + + + + name + Keyword + scope + keyword + settings + + foreground + #F92672 + + + + name + Storage + scope + storage + settings + + fontStyle + + foreground + #F92672 + + + + name + Storage type + scope + storage.type + settings + + fontStyle + italic + foreground + #66D9EF + + + + name + Class name + scope + entity.name.class + settings + + fontStyle + underline + foreground + #A6E22E + + + + name + Inherited class + scope + entity.other.inherited-class + settings + + fontStyle + italic underline + foreground + #A6E22E + + + + name + Function name + scope + entity.name.function + settings + + fontStyle + + foreground + #A6E22E + + + + name + Function argument + scope + variable.parameter + settings + + fontStyle + italic + foreground + #FD971F + + + + name + Tag name + scope + entity.name.tag + settings + + fontStyle + + foreground + #F92672 + + + + name + Tag attribute + scope + entity.other.attribute-name + settings + + fontStyle + + foreground + #A6E22E + + + + name + Library function + scope + support.function + settings + + fontStyle + + foreground + #66D9EF + + + + name + Library constant + scope + support.constant + settings + + fontStyle + + foreground + #66D9EF + + + + name + Library class/type + scope + support.type, support.class + settings + + fontStyle + italic + foreground + #66D9EF + + + + name + Library variable + scope + support.other.variable + settings + + fontStyle + + + + + name + Invalid + scope + invalid + settings + + background + #F92672 + fontStyle + + foreground + #F8F8F0 + + + + name + Invalid deprecated + scope + invalid.deprecated + settings + + background + #AE81FF + foreground + #F8F8F0 + + + + uuid + D8D5E82E-3D5B-46B5-B38E-8C841C21347D + + diff --git a/themes/Pastels on Dark.tmTheme b/vendor/themes/Pastels on Dark.tmTheme similarity index 100% rename from themes/Pastels on Dark.tmTheme rename to vendor/themes/Pastels on Dark.tmTheme diff --git a/themes/Slush & Poppies.tmTheme b/vendor/themes/Slush & Poppies.tmTheme similarity index 100% rename from themes/Slush & Poppies.tmTheme rename to vendor/themes/Slush & Poppies.tmTheme diff --git a/themes/Solarized (dark).tmTheme b/vendor/themes/Solarized (dark).tmTheme similarity index 100% rename from themes/Solarized (dark).tmTheme rename to vendor/themes/Solarized (dark).tmTheme diff --git a/themes/SpaceCadet.tmTheme b/vendor/themes/SpaceCadet.tmTheme similarity index 100% rename from themes/SpaceCadet.tmTheme rename to vendor/themes/SpaceCadet.tmTheme diff --git a/themes/Sunburst.tmTheme b/vendor/themes/Sunburst.tmTheme similarity index 100% rename from themes/Sunburst.tmTheme rename to vendor/themes/Sunburst.tmTheme diff --git a/themes/Twilight.tmTheme b/vendor/themes/Twilight.tmTheme similarity index 100% rename from themes/Twilight.tmTheme rename to vendor/themes/Twilight.tmTheme diff --git a/themes/Zenburnesque.tmTheme b/vendor/themes/Zenburnesque.tmTheme similarity index 100% rename from themes/Zenburnesque.tmTheme rename to vendor/themes/Zenburnesque.tmTheme diff --git a/themes/iPlastic.tmTheme b/vendor/themes/iPlastic.tmTheme similarity index 100% rename from themes/iPlastic.tmTheme rename to vendor/themes/iPlastic.tmTheme