Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
89d594a4
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
89d594a4
编写于
1月 06, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Small css tweaks
上级
badd8d18
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
18 addition
and
44 deletion
+18
-44
src/vs/editor/browser/view/viewImpl.ts
src/vs/editor/browser/view/viewImpl.ts
+1
-0
src/vs/editor/browser/view/viewOverlays.ts
src/vs/editor/browser/view/viewOverlays.ts
+2
-10
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.css
...ditor/browser/viewParts/contentWidgets/contentWidgets.css
+0
-8
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
...editor/browser/viewParts/contentWidgets/contentWidgets.ts
+2
-1
src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.css
...r/viewParts/currentLineHighlight/currentLineHighlight.css
+4
-4
src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css
...currentLineMarginHighlight/currentLineMarginHighlight.css
+4
-4
src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts
.../currentLineMarginHighlight/currentLineMarginHighlight.ts
+1
-1
src/vs/editor/browser/viewParts/lines/viewLine.ts
src/vs/editor/browser/viewParts/lines/viewLine.ts
+2
-10
src/vs/editor/browser/viewParts/lines/viewLines.css
src/vs/editor/browser/viewParts/lines/viewLines.css
+0
-5
src/vs/workbench/services/themes/electron-browser/stylesContributions.ts
...h/services/themes/electron-browser/stylesContributions.ts
+2
-1
未找到文件。
src/vs/editor/browser/view/viewImpl.ts
浏览文件 @
89d594a4
...
...
@@ -114,6 +114,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
// These two dom nodes must be constructed up front, since references are needed in the layout provider (scrolling & co.)
this
.
linesContent
=
document
.
createElement
(
'
div
'
);
this
.
linesContent
.
className
=
editorBrowser
.
ClassNames
.
LINES_CONTENT
+
'
monaco-editor-background
'
;
this
.
linesContent
.
style
.
position
=
'
absolute
'
;
this
.
domNode
=
document
.
createElement
(
'
div
'
);
this
.
domNode
.
className
=
configuration
.
editor
.
viewInfo
.
editorClassName
;
...
...
src/vs/editor/browser/view/viewOverlays.ts
浏览文件 @
89d594a4
...
...
@@ -159,17 +159,9 @@ export class ViewOverlayLine implements IVisibleLineData {
}
getLineOuterHTML
(
out
:
string
[],
lineNumber
:
number
,
deltaTop
:
number
):
void
{
out
.
push
(
'
<div lineNumber="
'
);
out
.
push
(
lineNumber
.
toString
());
out
.
push
(
'
" style="top:
'
);
out
.
push
(
deltaTop
.
toString
());
out
.
push
(
'
px;height:
'
);
out
.
push
(
this
.
_lineHeight
.
toString
());
out
.
push
(
'
px;" class="
'
);
out
.
push
(
editorBrowser
.
ClassNames
.
VIEW_LINE
);
out
.
push
(
'
">
'
);
out
.
push
(
`<div lineNumber="
${
lineNumber
}
" style="position:absolute;top:
${
deltaTop
}
px;width:100%;height:
${
this
.
_lineHeight
}
px;">`
);
out
.
push
(
this
.
getLineInnerHTML
(
lineNumber
));
out
.
push
(
'
</div>
'
);
out
.
push
(
`</div>`
);
}
getLineInnerHTML
(
lineNumber
:
number
):
string
{
...
...
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.css
已删除
100644 → 0
浏览文件 @
badd8d18
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
.monaco-editor
.contentWidgets
{
position
:
absolute
;
top
:
0
;
}
\ No newline at end of file
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
浏览文件 @
89d594a4
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
'
vs/css!./contentWidgets
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
{
StyleMutator
}
from
'
vs/base/browser/styleMutator
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
...
...
@@ -68,6 +67,8 @@ export class ViewContentWidgets extends ViewPart {
this
.
domNode
=
document
.
createElement
(
'
div
'
);
this
.
domNode
.
className
=
ClassNames
.
CONTENT_WIDGETS
;
this
.
domNode
.
style
.
position
=
'
absolute
'
;
this
.
domNode
.
style
.
top
=
'
0
'
;
this
.
overflowingContentWidgetsDomNode
=
document
.
createElement
(
'
div
'
);
this
.
overflowingContentWidgetsDomNode
.
className
=
ClassNames
.
OVERFLOWING_CONTENT_WIDGETS
;
...
...
src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.css
浏览文件 @
89d594a4
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
.monaco-editor
.current-line
{
.monaco-editor
.
view-overlays
.
current-line
{
display
:
block
;
position
:
absolute
;
left
:
0
;
...
...
@@ -11,14 +11,14 @@
box-sizing
:
border-box
;
}
.monaco-editor.vs
.current-line
{
.monaco-editor.vs
.
view-overlays
.
current-line
{
border
:
2px
solid
#eee
;
}
.monaco-editor.vs-dark
.current-line
{
.monaco-editor.vs-dark
.
view-overlays
.
current-line
{
border
:
2px
solid
#282828
;
}
.monaco-editor.hc-black
.current-line
{
.monaco-editor.hc-black
.
view-overlays
.
current-line
{
border
:
2px
solid
#f38518
;
}
src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css
浏览文件 @
89d594a4
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
.monaco-editor
.
current-line
{
.monaco-editor
.
margin-view-overlays
.current-line-margin
{
display
:
block
;
position
:
absolute
;
left
:
0
;
...
...
@@ -11,14 +11,14 @@
box-sizing
:
border-box
;
}
.monaco-editor.vs
.
current-line
{
.monaco-editor.vs
.
margin-view-overlays
.current-line-margin
{
border
:
2px
solid
#eee
;
}
.monaco-editor.vs-dark
.
current-line
{
.monaco-editor.vs-dark
.
margin-view-overlays
.current-line-margin
{
border
:
2px
solid
#282828
;
}
.monaco-editor.hc-black
.
current-line
{
.monaco-editor.hc-black
.
margin-view-overlays
.current-line-margin
{
border
:
2px
solid
#f38518
;
}
src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts
浏览文件 @
89d594a4
...
...
@@ -93,7 +93,7 @@ export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay {
if
(
lineNumber
===
this
.
_primaryCursorLineNumber
)
{
if
(
this
.
_shouldShowCurrentLine
())
{
return
(
'
<div class="current-line" style="width:
'
'
<div class="current-line
-margin
" style="width:
'
+
String
(
this
.
_contentLeft
)
+
'
px; height:
'
+
String
(
this
.
_lineHeight
)
...
...
src/vs/editor/browser/viewParts/lines/viewLine.ts
浏览文件 @
89d594a4
...
...
@@ -133,17 +133,9 @@ export class ViewLine implements IVisibleLineData {
}
public
getLineOuterHTML
(
out
:
string
[],
lineNumber
:
number
,
deltaTop
:
number
):
void
{
out
.
push
(
'
<div lineNumber="
'
);
out
.
push
(
lineNumber
.
toString
());
out
.
push
(
'
" style="top:
'
);
out
.
push
(
deltaTop
.
toString
());
out
.
push
(
'
px;height:
'
);
out
.
push
(
this
.
_lineHeight
.
toString
());
out
.
push
(
'
px;" class="
'
);
out
.
push
(
ClassNames
.
VIEW_LINE
);
out
.
push
(
'
">
'
);
out
.
push
(
`<div lineNumber="
${
lineNumber
}
" style="top:
${
deltaTop
}
px;height:
${
this
.
_lineHeight
}
px;" class="
${
ClassNames
.
VIEW_LINE
}
">`
);
out
.
push
(
this
.
getLineInnerHTML
(
lineNumber
));
out
.
push
(
'
</div>
'
);
out
.
push
(
`</div>`
);
}
public
getLineInnerHTML
(
lineNumber
:
number
):
string
{
...
...
src/vs/editor/browser/viewParts/lines/viewLines.css
浏览文件 @
89d594a4
...
...
@@ -47,11 +47,6 @@
width
:
100%
;
}
.monaco-editor
.lines-content
{
position
:
absolute
;
top
:
0
;
}
/* TODO@tokenization bootstrap fix */
/*.monaco-editor .view-line > span > span {
float: none;
...
...
src/vs/workbench/services/themes/electron-browser/stylesContributions.ts
浏览文件 @
89d594a4
...
...
@@ -278,7 +278,8 @@ class EditorReferenceSearchStyleRules extends EditorStyleRules {
class
EditorLineHighlightStyleRules
extends
EditorStyleRules
{
public
getCssRules
(
theme
:
Theme
,
cssRules
:
string
[]):
void
{
if
(
theme
.
getGlobalSettings
().
lineHighlight
)
{
cssRules
.
push
(
`.monaco-editor.
${
theme
.
getSelector
()}
.current-line { background-color:
${
new
Color
(
theme
.
getGlobalSettings
().
lineHighlight
)}
; border: none; }`
);
cssRules
.
push
(
`.monaco-editor.
${
theme
.
getSelector
()}
.view-overlays .current-line { background-color:
${
new
Color
(
theme
.
getGlobalSettings
().
lineHighlight
)}
; border: none; }`
);
cssRules
.
push
(
`.monaco-editor.
${
theme
.
getSelector
()}
.margin-view-overlays .current-line-margin { background-color:
${
new
Color
(
theme
.
getGlobalSettings
().
lineHighlight
)}
; border: none; }`
);
}
this
.
addBackgroundColorRule
(
theme
,
'
.rangeHighlight
'
,
theme
.
getGlobalSettings
().
rangeHighlight
,
cssRules
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录