Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d653e9ca
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,发现更多精彩内容 >>
提交
d653e9ca
编写于
4月 20, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3355 - Move "also configured in..." to next to title
上级
55a47818
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
18 deletion
+19
-18
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
...bench/parts/preferences/browser/media/settingsEditor2.css
+6
-7
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+13
-11
未找到文件。
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
浏览文件 @
d653e9ca
...
...
@@ -110,6 +110,11 @@
line-height
:
initial
;
}
.settings-editor
>
.settings-body
>
.settings-list-container
.monaco-list-row
.setting-item-title
.setting-item-overrides
{
opacity
:
0.5
;
margin-left
:
10px
;
}
.settings-editor
>
.settings-body
>
.settings-list-container
.monaco-list-row
.setting-item-label
{
font-size
:
15px
;
font-weight
:
bold
;
...
...
@@ -124,7 +129,7 @@
}
.settings-editor
>
.settings-body
>
.settings-list-container
.monaco-list-row
.setting-item-description
{
opacity
:
0.
6
;
opacity
:
0.
7
;
margin-top
:
5px
;
height
:
36px
;
overflow
:
hidden
;
...
...
@@ -168,12 +173,6 @@
visibility
:
visible
;
}
.settings-editor
>
.settings-body
>
.settings-list-container
.monaco-list-row
.setting-item-overrides
{
opacity
:
0.6
;
margin-top
:
5px
;
text-align
:
center
;
}
.settings-editor
>
.settings-body
>
.settings-list-container
.monaco-list-row.all-settings
{
display
:
flex
;
}
...
...
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
d653e9ca
...
...
@@ -192,7 +192,7 @@ export class SettingsEditor2 extends BaseEditor {
}));
this
.
_register
(
this
.
searchWidget
.
onDidChange
(()
=>
this
.
onInputChanged
()));
const
headerControlsContainer
=
DOM
.
append
(
this
.
headerContainer
,
$
(
'
div
.settings-header-controls
'
));
const
headerControlsContainer
=
DOM
.
append
(
this
.
headerContainer
,
$
(
'
.settings-header-controls
'
));
const
targetWidgetContainer
=
DOM
.
append
(
headerControlsContainer
,
$
(
'
.settings-target-container
'
));
this
.
settingsTargetsWidget
=
this
.
_register
(
this
.
instantiationService
.
createInstance
(
SettingsTargetsWidget
,
targetWidgetContainer
));
this
.
settingsTargetsWidget
.
settingsTarget
=
ConfigurationTarget
.
USER
;
...
...
@@ -542,7 +542,7 @@ interface ISettingItemTemplate {
containerElement
:
HTMLElement
;
labelElement
:
HTMLElement
;
keyElement
:
HTMLElement
;
//
keyElement: HTMLElement;
descriptionElement
:
HTMLElement
;
valueElement
:
HTMLElement
;
overridesElement
:
HTMLElement
;
...
...
@@ -581,24 +581,24 @@ class SettingItemRenderer implements IRenderer<ISettingItemEntry, ISettingItemTe
renderTemplate
(
parent
:
HTMLElement
):
ISettingItemTemplate
{
DOM
.
addClass
(
parent
,
'
setting-item
'
);
const
itemContainer
=
DOM
.
append
(
parent
,
$
(
'
div
.setting-item-container
'
));
const
itemContainer
=
DOM
.
append
(
parent
,
$
(
'
.setting-item-container
'
));
const
leftElement
=
DOM
.
append
(
itemContainer
,
$
(
'
.setting-item-left
'
));
const
rightElement
=
DOM
.
append
(
itemContainer
,
$
(
'
.setting-item-right
'
));
const
titleElement
=
DOM
.
append
(
leftElement
,
$
(
'
div
.setting-item-title
'
));
const
titleElement
=
DOM
.
append
(
leftElement
,
$
(
'
.setting-item-title
'
));
const
labelElement
=
DOM
.
append
(
titleElement
,
$
(
'
span.setting-item-label
'
));
const
keyElement
=
DOM
.
append
(
titleElement
,
$
(
'
span.setting-item-key
'
));
const
descriptionElement
=
DOM
.
append
(
leftElement
,
$
(
'
div.setting-item-description
'
));
// const keyElement = DOM.append(titleElement, $('span.setting-item-key'));
const
overridesElement
=
DOM
.
append
(
titleElement
,
$
(
'
span.setting-item-overrides
'
));
const
descriptionElement
=
DOM
.
append
(
leftElement
,
$
(
'
.setting-item-description
'
));
const
valueElement
=
DOM
.
append
(
rightElement
,
$
(
'
div.setting-item-value
'
));
const
overridesElement
=
DOM
.
append
(
rightElement
,
$
(
'
div.setting-item-overrides
'
));
const
valueElement
=
DOM
.
append
(
rightElement
,
$
(
'
.setting-item-value
'
));
return
{
parent
:
parent
,
toDispose
:
[],
containerElement
:
itemContainer
,
keyElement
,
//
keyElement,
labelElement
,
descriptionElement
,
valueElement
,
...
...
@@ -609,8 +609,9 @@ class SettingItemRenderer implements IRenderer<ISettingItemEntry, ISettingItemTe
renderElement
(
entry
:
ISettingItemEntry
,
index
:
number
,
template
:
ISettingItemTemplate
):
void
{
DOM
.
toggleClass
(
template
.
parent
,
'
odd
'
,
index
%
2
===
1
);
template
.
keyElement
.
textContent
=
entry
.
key
;
//
template.keyElement.textContent = entry.key;
template
.
labelElement
.
textContent
=
settingKeyToLabel
(
entry
.
key
);
template
.
labelElement
.
title
=
entry
.
key
;
template
.
descriptionElement
.
textContent
=
entry
.
description
;
DOM
.
toggleClass
(
template
.
parent
,
'
is-configured
'
,
entry
.
isConfigured
);
...
...
@@ -627,7 +628,8 @@ class SettingItemRenderer implements IRenderer<ISettingItemEntry, ISettingItemTe
}));
template
.
toDispose
.
push
(
resetButton
);
template
.
overridesElement
.
textContent
=
entry
.
overriddenScopeList
.
length
?
'
Also configured in:
'
+
entry
.
overriddenScopeList
.
join
(
'
,
'
)
:
const
alsoConfiguredInLabel
=
localize
(
'
alsoConfiguredIn
'
,
"
Also configured in:
"
);
template
.
overridesElement
.
textContent
=
entry
.
overriddenScopeList
.
length
?
`(
${
alsoConfiguredInLabel
}
${
entry
.
overriddenScopeList
.
join
(
'
,
'
)}
)`
:
''
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录