mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Merge branch 'dev' into markers
This commit is contained in:
Nathan Sobo
@@ -6,7 +6,6 @@ Range = require 'range'
|
||||
EditSession = require 'edit-session'
|
||||
CursorView = require 'cursor-view'
|
||||
SelectionView = require 'selection-view'
|
||||
Native = require 'native'
|
||||
fs = require 'fs'
|
||||
$ = require 'jquery'
|
||||
_ = require 'underscore'
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
# This a weirdo file. We don't create a Window class, we just add stuff to
|
||||
# the DOM window.
|
||||
|
||||
Native = require 'native'
|
||||
fs = require 'fs'
|
||||
$ = require 'jquery'
|
||||
Config = require 'config'
|
||||
@@ -96,11 +95,11 @@ windowAdditions =
|
||||
atom.confirm(
|
||||
"There are unsaved buffers, reload anyway?",
|
||||
"You will lose all unsaved changes if you reload",
|
||||
"Reload", (-> Native.reload()),
|
||||
"Reload", (-> $native.reload()),
|
||||
"Cancel"
|
||||
)
|
||||
else
|
||||
Native.reload()
|
||||
$native.reload()
|
||||
|
||||
onerror: ->
|
||||
atom.showDevTools()
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
.bracket-matcher {
|
||||
position: absolute;
|
||||
border-bottom: 1px solid #f8de7e;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
DeferredAtomPackage = require 'deferred-atom-package'
|
||||
LoadPathsTask = require './src/load-paths-task'
|
||||
|
||||
module.exports =
|
||||
class FuzzyFinder extends DeferredAtomPackage
|
||||
@@ -16,6 +15,7 @@ class FuzzyFinder extends DeferredAtomPackage
|
||||
|
||||
if rootView.project.getPath()?
|
||||
callback = (paths) => @projectPaths = paths
|
||||
LoadPathsTask = require 'fuzzy-finder/src/load-paths-task'
|
||||
new LoadPathsTask(rootView, callback).start()
|
||||
|
||||
onLoadEvent: (event, instance) ->
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
.markdown-preview {
|
||||
font-family: "Helvetica Neue", Helvetica, sans-serif;
|
||||
font-size: 14px;
|
||||
line-height: 1.6;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
background-color: #F4F4F4;
|
||||
background-color: #fff;
|
||||
overflow: auto;
|
||||
z-index: 3;
|
||||
box-sizing: border-box;
|
||||
@@ -12,14 +15,7 @@
|
||||
}
|
||||
|
||||
.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,
|
||||
@@ -4,7 +4,7 @@ fs = require 'fs'
|
||||
module.exports =
|
||||
class Tab extends View
|
||||
@content: (editSession) ->
|
||||
@div class: 'tab', =>
|
||||
@li class: 'tab', =>
|
||||
@span class: 'file-name', outlet: 'fileName'
|
||||
@span class: 'close-icon'
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ class Tabs extends View
|
||||
pane.prepend(new Tabs(editor))
|
||||
|
||||
@content: ->
|
||||
@div class: 'tabs'
|
||||
@ul class: 'tabs'
|
||||
|
||||
initialize: (@editor) ->
|
||||
for editSession, index in @editor.editSessions
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
.tabs {
|
||||
-webkit-user-select: none;
|
||||
display: -webkit-box;
|
||||
-webkit-box-align: center;
|
||||
}
|
||||
|
||||
.tab {
|
||||
-webkit-box-flex: 2;
|
||||
position: relative;
|
||||
width: 175px;
|
||||
max-width: 175px;
|
||||
min-width: 40px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.tab.active {
|
||||
-webkit-box-flex: 1;
|
||||
}
|
||||
|
||||
.tab.file-modified .close-icon {
|
||||
top: 6px;
|
||||
width: 5px;
|
||||
height: 5px;
|
||||
right: 5px;
|
||||
}
|
||||
|
||||
.tab .file-name {
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
padding: 3px 5px;
|
||||
}
|
||||
@@ -3,7 +3,6 @@ _ = require 'underscore'
|
||||
TreeView = require 'tree-view/src/tree-view'
|
||||
RootView = require 'root-view'
|
||||
Directory = require 'directory'
|
||||
Native = require 'native'
|
||||
fs = require 'fs'
|
||||
|
||||
describe "TreeView", ->
|
||||
|
||||
@@ -4,7 +4,6 @@ Directory = require 'directory'
|
||||
DirectoryView = require 'tree-view/src/directory-view'
|
||||
FileView = require 'tree-view/src/file-view'
|
||||
Dialog = require 'tree-view/src/dialog'
|
||||
Native = require 'native'
|
||||
fs = require 'fs'
|
||||
$ = require 'jquery'
|
||||
_ = require 'underscore'
|
||||
@@ -256,7 +255,7 @@ class TreeView extends ScrollView
|
||||
atom.confirm(
|
||||
"Are you sure you would like to delete the selected #{entryType}?",
|
||||
"You are deleting #{entry.getPath()}",
|
||||
"Move to Trash", (=> Native.moveToTrash(entry.getPath())),
|
||||
"Move to Trash", (=> $native.moveToTrash(entry.getPath())),
|
||||
"Cancel", null
|
||||
"Delete", (=> fs.remove(entry.getPath()))
|
||||
)
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
module.exports =
|
||||
class Native
|
||||
@reload: -> $native.reload()
|
||||
|
||||
@moveToTrash: (args...) -> $native.moveToTrash(args...)
|
||||
@@ -1,59 +1,45 @@
|
||||
.tabs {
|
||||
font: caption;
|
||||
margin-bottom: 1px;
|
||||
-webkit-user-select: none;
|
||||
display: -webkit-box;
|
||||
-webkit-box-align: center;
|
||||
}
|
||||
|
||||
.tab {
|
||||
cursor: default;
|
||||
padding: 2px 21px 2px 9px;
|
||||
-webkit-box-flex: 2;
|
||||
position: relative;
|
||||
width: 175px;
|
||||
max-width: 175px;
|
||||
min-width: 40px;
|
||||
box-sizing: border-box;
|
||||
text-shadow: -1px -1px 0 #000;
|
||||
font-size: 11px;
|
||||
padding: 5px 10px;
|
||||
}
|
||||
|
||||
.tab.file-modified .close-icon {
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.tab.file-modified .close-icon:before {
|
||||
content: "";
|
||||
}
|
||||
|
||||
.tab.active:before,
|
||||
.tab.active:after {
|
||||
position: absolute;
|
||||
bottom: -1px;
|
||||
width: 4px;
|
||||
height: 4px;
|
||||
content: " ";
|
||||
z-index: 3;
|
||||
}
|
||||
|
||||
.tab.active:before {
|
||||
left: -4px;
|
||||
}
|
||||
|
||||
.tab.active:after {
|
||||
right: -4px;
|
||||
border-width: 0 0 1px 1px;
|
||||
}
|
||||
|
||||
.tab.active:first-child:before {
|
||||
display: none;
|
||||
.tab.active {
|
||||
-webkit-box-flex: 1;
|
||||
}
|
||||
|
||||
.tab .file-name {
|
||||
font-size: 11px;
|
||||
text-shadow: 0 -1px 1px black;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
padding: 3px 5px;
|
||||
}
|
||||
|
||||
.tab .close-icon {
|
||||
font-family: 'Octicons Regular';
|
||||
font-size: 14px;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
display: block;
|
||||
font-size: 12px;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
right: 4px;
|
||||
top: -1px;
|
||||
color: rgba(255, 255, 255, 0.5);
|
||||
right: 5px;
|
||||
top: 4px;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
@@ -62,5 +48,31 @@
|
||||
}
|
||||
|
||||
.tab .close-icon:hover {
|
||||
color: white;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.tab.file-modified .close-icon {
|
||||
top: 10px;
|
||||
width: 5px;
|
||||
height: 5px;
|
||||
right: 6px;
|
||||
border: 2px solid #66a6ff;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
.tab.file-modified .close-icon:before {
|
||||
content: "";
|
||||
}
|
||||
|
||||
.tab.file-modified:hover .close-icon {
|
||||
border: none;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
right: 5px;
|
||||
top: 4px;
|
||||
}
|
||||
|
||||
.tab.file-modified:hover .close-icon:before {
|
||||
content: "\f081";
|
||||
color: #66a6ff;
|
||||
}
|
||||
@@ -15,6 +15,12 @@
|
||||
background-color: rgba(255, 255, 255, 0.14);
|
||||
}
|
||||
|
||||
.bracket-matcher {
|
||||
border-bottom: 1px solid #f8de7e;
|
||||
margin-top: -1px;
|
||||
opacity: .7;
|
||||
}
|
||||
|
||||
.comment {
|
||||
color: #7C7C7C;
|
||||
}
|
||||
|
||||
@@ -1,21 +1,7 @@
|
||||
.is-blurred .tree-view {
|
||||
background-color: #2a2a2a;
|
||||
}
|
||||
|
||||
.is-blurred .tabs {
|
||||
opacity: 0.8;
|
||||
border-bottom-color: #525252;
|
||||
background-color: #202123;
|
||||
}
|
||||
|
||||
.is-blurred .tab {
|
||||
background-image: -webkit-linear-gradient(#444, #555);
|
||||
}
|
||||
|
||||
.is-blurred .tab.active {
|
||||
border: 1px solid #525252
|
||||
}
|
||||
|
||||
.is-blurred .tab.active:before {
|
||||
box-shadow: 2px 2px 0 #525252;
|
||||
border-color: #696969;
|
||||
opacity: 0.5;
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
.bracket-matcher {
|
||||
border-bottom: 1px solid #f8de7e;
|
||||
margin-top: -1px;
|
||||
opacity: .7;
|
||||
}
|
||||
@@ -1,442 +0,0 @@
|
||||
.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 a {
|
||||
color: #4183c4;
|
||||
}
|
||||
|
||||
.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; }
|
||||
@@ -6,10 +6,8 @@
|
||||
"tree-view.css",
|
||||
"tabs.css",
|
||||
"status-bar.css",
|
||||
"markdown-preview.css",
|
||||
"command-panel.css",
|
||||
"command-logger.css",
|
||||
"blurred.css",
|
||||
"bracket-matcher.css"
|
||||
"blurred.css"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,80 +1,38 @@
|
||||
.tabs {
|
||||
background: #333333;
|
||||
border-bottom: 4px solid #424242;
|
||||
box-shadow: inset 0 -1px 0 #2e2e2e, 0 1px 0 #191919;
|
||||
background: #161719;
|
||||
border: none;
|
||||
box-shadow: none;
|
||||
border-bottom: 4px solid rgba(41, 44, 47, 1);
|
||||
box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
.tab {
|
||||
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:first-child {
|
||||
box-shadow: inset 0 0 5px #383838, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a;
|
||||
}
|
||||
|
||||
.tab.active,
|
||||
.tab.active:hover {
|
||||
border-top: 1px solid #4a4a4a;
|
||||
box-shadow: inset -1px 0 0 #595959, inset 1px 0 0 #595959;
|
||||
border-bottom-color: #424242;
|
||||
background-image: -webkit-linear-gradient(#555555, #424242);
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
|
||||
.tab.active:first-child,
|
||||
.tab.active:first-child:hover {
|
||||
box-shadow: inset -1px 0 0 #595959;
|
||||
}
|
||||
|
||||
.tab.active:before,
|
||||
.tab.active:after {
|
||||
border: 1px solid #595959;
|
||||
}
|
||||
|
||||
.tab.active:before {
|
||||
border-bottom-right-radius: 4px;
|
||||
border-width: 0 1px 1px 0;
|
||||
box-shadow: 2px 2px 0 #424242;
|
||||
}
|
||||
|
||||
.tab.active:after {
|
||||
border-bottom-left-radius: 4px;
|
||||
border-width: 0 0 1px 1px;
|
||||
box-shadow: -2px 2px 0 #424242;
|
||||
margin: 0 0 1px 1px;
|
||||
background-image: -webkit-linear-gradient(#292c2f, #1d1f21);
|
||||
box-shadow:
|
||||
inset 0 2px 0 rgba(255, 255, 255, 0.1),
|
||||
inset 0 1px 0 rgba(0, 0, 0, 1),
|
||||
inset 1px 0 0 rgba(255, 255, 255, 0.05),
|
||||
inset -1px 0 0 rgba(255, 255, 255, 0.05);
|
||||
color: #b9bdc1;
|
||||
}
|
||||
|
||||
.tab:hover {
|
||||
color: #c8c8c8;
|
||||
background-image: -webkit-linear-gradient(#474747, #444444);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.tab.active {
|
||||
background-image: -webkit-linear-gradient(#43484d, #303337);
|
||||
color: #fff;
|
||||
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
|
||||
box-shadow:
|
||||
inset 0 1px 0 rgba(0, 0, 0, 0.5),
|
||||
inset 0 2px 0 rgba(255, 255, 255, 0.1),
|
||||
inset 1px 0 0 rgba(255, 255, 255, 0.1),
|
||||
inset -1px 0 0 rgba(255, 255, 255, 0.1),
|
||||
inset 0 -1px 0 rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
.tab.active:hover .close-icon {
|
||||
color: #fff;
|
||||
}
|
||||
@@ -1,6 +1,9 @@
|
||||
.tree-view {
|
||||
background: #1e1e1e;
|
||||
border-right: 1px solid #191919;
|
||||
background: #1b1c1e;
|
||||
box-shadow:
|
||||
1px 0 0 #131516,
|
||||
inset -1px 0 0 rgba(255, 255, 255, 0.02),
|
||||
1px 0 3px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
.tree-view .entry {
|
||||
|
||||
@@ -20,6 +20,12 @@
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.bracket-matcher {
|
||||
background-color: #C9C9C9;
|
||||
opacity: .7;
|
||||
border-bottom: 0 none;
|
||||
}
|
||||
|
||||
.editor .string {
|
||||
color: #D14;
|
||||
}
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
.is-blurred .tab {
|
||||
background-image: none;
|
||||
background-color: #e0e0e0);
|
||||
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;
|
||||
}
|
||||
|
||||
.is-blurred .tab.active {
|
||||
border-bottom: 1px solid #e5e5e5;
|
||||
box-shadow: inset 0 0 5px #eee, inset -1px 0 0 #e0e0e0, inset 1px 0 0 #e0e0e0;
|
||||
}
|
||||
|
||||
.is-blurred .tree-view {
|
||||
background: #f3f3f3;
|
||||
border-right: 1px solid #c5c5c5;
|
||||
}
|
||||
|
||||
.is-blurred .tab {
|
||||
background-image: -webkit-linear-gradient(#e7e7e7, #cfcfcf);
|
||||
box-shadow:
|
||||
inset 0 1px 0 rgba(255, 255, 255, 0.5), /* top hightlight */
|
||||
inset 1px 0 0 rgba(255, 255, 255, 0.3), /* left highlight */
|
||||
inset 0 -1px 0 rgba(255, 255, 255, 0.2), /* bottom shadow */
|
||||
inset -1px 0 0 rgba(0, 0, 0, 0.2), /* right shadow */
|
||||
inset -2px 0 0 rgba(255, 255, 255, 0.1); /* right hightlight */
|
||||
color: #777;
|
||||
}
|
||||
|
||||
.is-blurred .tab .close-icon {
|
||||
color: #777;
|
||||
}
|
||||
|
||||
.is-blurred .tree-view:focus .selected > .highlight {
|
||||
border-top: 1px solid #3D4552;
|
||||
border-bottom: 1px solid #3D4552;
|
||||
@@ -35,4 +35,4 @@
|
||||
|
||||
.is-blurred .tree-view .name:before {
|
||||
color: #7e7e7e;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
.bracket-matcher {
|
||||
border-bottom: 1px solid #f8de7e;
|
||||
margin-top: -1px;
|
||||
opacity: .7;
|
||||
}
|
||||
@@ -6,10 +6,8 @@
|
||||
"tree-view.css",
|
||||
"tabs.css",
|
||||
"status-bar.css",
|
||||
"markdown-preview.css",
|
||||
"command-panel.css",
|
||||
"command-logger.css",
|
||||
"blurred.css",
|
||||
"bracket-matcher.css"
|
||||
"blurred.css"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,84 +1,49 @@
|
||||
.tabs {
|
||||
background: #e3e3e3;
|
||||
border-bottom: 4px solid #e5e5e5;
|
||||
box-shadow: inset 0 -1px 0 #959595, 0 1px 0 #989898;
|
||||
background: #e1e1e1;
|
||||
border: none;
|
||||
border-bottom: 4px solid #ddd;
|
||||
box-shadow: inset 0 -1px 0 #666;
|
||||
}
|
||||
|
||||
.tab {
|
||||
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;
|
||||
margin: 0 0 1px 0;
|
||||
background-image: -webkit-linear-gradient(#e7e7e7, #cfcfcf);
|
||||
color: #444;
|
||||
text-shadow: 1px 1px rgba(255, 255, 255, 0.1);
|
||||
box-shadow:
|
||||
inset 0 1px 0 rgba(255, 255, 255, 0.5), /* top hightlight */
|
||||
inset 1px 0 0 rgba(255, 255, 255, 0.3), /* left highlight */
|
||||
inset 0 -1px 0 rgba(255, 255, 255, 0.2), /* bottom shadow */
|
||||
inset -1px 0 0 rgba(0, 0, 0, 0.2), /* right shadow */
|
||||
inset -2px 0 0 rgba(255, 255, 255, 0.1); /* right hightlight */
|
||||
}
|
||||
|
||||
.tab.active {
|
||||
background-image: -webkit-linear-gradient(#fefefe, #e7e6e7);
|
||||
color: #323232;
|
||||
text-shadow: 1px 1px rgba(255, 255, 255, 0.5);
|
||||
box-shadow:
|
||||
inset -1px 0 0 rgba(0, 0, 0, 0.3),
|
||||
inset 0 1px 0 rgba(255, 255, 255, 1),
|
||||
inset 0 -1px 0 rgba(255, 255, 255, 1);
|
||||
}
|
||||
|
||||
.tab:hover {
|
||||
background-image: -webkit-linear-gradient(#e2e2e2, #e0e0e0);
|
||||
background-image: -webkit-linear-gradient(#e2e2e2, #ddd);
|
||||
}
|
||||
|
||||
.tab .close-icon {
|
||||
color: rgba(0,0,0,0.3);
|
||||
}
|
||||
|
||||
.tab.active,
|
||||
.tab.active:hover {
|
||||
.tab.active {
|
||||
color: #010101;
|
||||
}
|
||||
|
||||
.tab.active:first-child,
|
||||
.tab.active:first-child:hover {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.tab.file-modified.active .close-icon {
|
||||
border-color: #aaa;
|
||||
}
|
||||
|
||||
.tab:hover .close-icon {
|
||||
color: #c8c8c8;
|
||||
border-color: #c8c8c8;
|
||||
.tab .close-icon {
|
||||
color: #323232;
|
||||
}
|
||||
|
||||
.tab.file-modified .close-icon {
|
||||
border: 3px solid #777;
|
||||
border-radius: 10px;
|
||||
border-color: #1965d0;
|
||||
}
|
||||
|
||||
.tab.active,
|
||||
.tab.active:hover {
|
||||
border-bottom-color: #e5e5e5;
|
||||
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 {
|
||||
border: 1px solid #959595;
|
||||
}
|
||||
|
||||
.tab.active:before {
|
||||
left: -5px;
|
||||
border-bottom-right-radius: 4px;
|
||||
border-width: 0 1px 1px 0;
|
||||
box-shadow: 2px 2px 0 #e5e5e5;
|
||||
}
|
||||
|
||||
.tab.active:after {
|
||||
right: -5px;
|
||||
border-bottom-left-radius: 4px;
|
||||
border-width: 0 0 1px 1px;
|
||||
box-shadow: -2px 2px 0 #e5e5e5;
|
||||
}
|
||||
|
||||
.tab:hover {
|
||||
background-image: -webkit-linear-gradient(#e2e2e2, #e0e0e0);
|
||||
}
|
||||
|
||||
.tab .file-name {
|
||||
text-shadow: 0 1px 0 #e0e0e0;
|
||||
}
|
||||
|
||||
.tab .close-icon:hover {
|
||||
color: #aaa;
|
||||
.tab.file-modified:hover .close-icon:before {
|
||||
color: #1965d0;
|
||||
}
|
||||
|
||||
7
vendor/space-pen.coffee
vendored
7
vendor/space-pen.coffee
vendored
@@ -1,4 +1,4 @@
|
||||
# Modified from 248eef5762e395c7d496510dbd06a20b65f89f45
|
||||
# Modified from f6ef4ba2ffdc27b6c9a057560f1f527b1e0f3e8b
|
||||
$ = jQuery = require('jquery')
|
||||
|
||||
elements =
|
||||
@@ -58,7 +58,6 @@ class View extends jQuery
|
||||
fragment
|
||||
|
||||
constructor: (args...) ->
|
||||
# args[0] ?= {}
|
||||
[html, postProcessingSteps] = @constructor.buildHtml -> @content(args...)
|
||||
jQuery.fn.init.call(this, html)
|
||||
@constructor = jQuery # sadly, jQuery assumes this.constructor == jQuery in pushStack
|
||||
@@ -198,7 +197,9 @@ for methodName in ['prependTo', 'appendTo', 'insertAfter', 'insertBefore']
|
||||
|
||||
originalCleanData = jQuery.cleanData
|
||||
jQuery.cleanData = (elements) ->
|
||||
$(element).view()?.afterRemove?() for element in elements
|
||||
for element in elements
|
||||
view = $(element).view()
|
||||
view.afterRemove?() if view?[0] == element
|
||||
originalCleanData(elements)
|
||||
|
||||
(exports ? this).View = View
|
||||
|
||||
Reference in New Issue
Block a user