Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5854f63f
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(gitcode.net)2024年7月9日维护升级公告
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
5854f63f
编写于
12月 12, 2019
作者:
M
Miguel Solorio
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update menu icons to use icon font #86708
上级
ec654dbd
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
33 addition
and
57 deletion
+33
-57
src/vs/base/browser/ui/menu/check.svg
src/vs/base/browser/ui/menu/check.svg
+0
-3
src/vs/base/browser/ui/menu/ellipsis.svg
src/vs/base/browser/ui/menu/ellipsis.svg
+0
-5
src/vs/base/browser/ui/menu/menu.css
src/vs/base/browser/ui/menu/menu.css
+20
-16
src/vs/base/browser/ui/menu/menu.ts
src/vs/base/browser/ui/menu/menu.ts
+4
-4
src/vs/base/browser/ui/menu/menubar.ts
src/vs/base/browser/ui/menu/menubar.ts
+1
-1
src/vs/base/browser/ui/menu/submenu.svg
src/vs/base/browser/ui/menu/submenu.svg
+0
-3
src/vs/workbench/browser/parts/titlebar/media/chrome-close-dark.svg
...kbench/browser/parts/titlebar/media/chrome-close-dark.svg
+0
-1
src/vs/workbench/browser/parts/titlebar/media/chrome-close.svg
...s/workbench/browser/parts/titlebar/media/chrome-close.svg
+0
-1
src/vs/workbench/browser/parts/titlebar/media/chrome-maximize-dark.svg
...nch/browser/parts/titlebar/media/chrome-maximize-dark.svg
+0
-1
src/vs/workbench/browser/parts/titlebar/media/chrome-maximize.svg
...orkbench/browser/parts/titlebar/media/chrome-maximize.svg
+0
-1
src/vs/workbench/browser/parts/titlebar/media/chrome-minimize-dark.svg
...nch/browser/parts/titlebar/media/chrome-minimize-dark.svg
+0
-1
src/vs/workbench/browser/parts/titlebar/media/chrome-minimize.svg
...orkbench/browser/parts/titlebar/media/chrome-minimize.svg
+0
-1
src/vs/workbench/browser/parts/titlebar/media/chrome-restore-dark.svg
...ench/browser/parts/titlebar/media/chrome-restore-dark.svg
+0
-1
src/vs/workbench/browser/parts/titlebar/media/chrome-restore.svg
...workbench/browser/parts/titlebar/media/chrome-restore.svg
+0
-1
src/vs/workbench/browser/parts/titlebar/menubarControl.ts
src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+8
-17
未找到文件。
src/vs/base/browser/ui/menu/check.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"16"
height=
"16"
viewBox=
"0 0 16 16"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
>
<path
fill-rule=
"evenodd"
clip-rule=
"evenodd"
d=
"M14.4315 3.3232L5.96151 13.3232L5.1708 13.2874L1.8208 8.5174L2.63915 7.94268L5.61697 12.1827L13.6684 2.67688L14.4315 3.3232Z"
fill=
"#C5C5C5"
/>
</svg>
src/vs/base/browser/ui/menu/ellipsis.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"16"
height=
"16"
viewBox=
"0 0 16 16"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
>
<path
d=
"M4 8C4 8.19778 3.94135 8.39112 3.83147 8.55557C3.72159 8.72002 3.56541 8.84819 3.38268 8.92388C3.19996 8.99957 2.99889 9.01937 2.80491 8.98079C2.61093 8.9422 2.43275 8.84696 2.29289 8.70711C2.15304 8.56725 2.0578 8.38907 2.01922 8.19509C1.98063 8.00111 2.00043 7.80004 2.07612 7.61732C2.15181 7.43459 2.27998 7.27841 2.44443 7.16853C2.60888 7.05865 2.80222 7 3 7C3.26522 7 3.51957 7.10536 3.70711 7.29289C3.89464 7.48043 4 7.73478 4 8Z"
fill=
"#C5C5C5"
/>
<path
d=
"M9 8C9 8.19778 8.94135 8.39112 8.83147 8.55557C8.72159 8.72002 8.56541 8.84819 8.38268 8.92388C8.19996 8.99957 7.99889 9.01937 7.80491 8.98079C7.61093 8.9422 7.43275 8.84696 7.29289 8.70711C7.15304 8.56725 7.0578 8.38907 7.01922 8.19509C6.98063 8.00111 7.00043 7.80004 7.07612 7.61732C7.15181 7.43459 7.27998 7.27841 7.44443 7.16853C7.60888 7.05865 7.80222 7 8 7C8.26522 7 8.51957 7.10536 8.70711 7.29289C8.89464 7.48043 9 7.73478 9 8Z"
fill=
"#C5C5C5"
/>
<path
d=
"M14 8C14 8.19778 13.9414 8.39112 13.8315 8.55557C13.7216 8.72002 13.5654 8.84819 13.3827 8.92388C13.2 8.99957 12.9989 9.01937 12.8049 8.98079C12.6109 8.9422 12.4327 8.84696 12.2929 8.70711C12.153 8.56725 12.0578 8.38907 12.0192 8.19509C11.9806 8.00111 12.0004 7.80004 12.0761 7.61732C12.1518 7.43459 12.28 7.27841 12.4444 7.16853C12.6089 7.05865 12.8022 7 13 7C13.2652 7 13.5196 7.10536 13.7071 7.29289C13.8946 7.48043 14 7.73478 14 8Z"
fill=
"#C5C5C5"
/>
</svg>
src/vs/base/browser/ui/menu/menu.css
浏览文件 @
5854f63f
...
...
@@ -51,8 +51,17 @@
.monaco-menu
.monaco-action-bar.vertical
.submenu-indicator
{
height
:
100%
;
mask
:
url('submenu.svg')
no-repeat
90%
50%
/
13px
13px
;
-webkit-mask
:
url('submenu.svg')
no-repeat
90%
50%
/
13px
13px
;
}
.monaco-menu
.monaco-action-bar.vertical
.submenu-indicator.codicon
{
font-size
:
16px
;
display
:
flex
;
align-items
:
center
;
}
.monaco-menu
.monaco-action-bar.vertical
.submenu-indicator.codicon
::before
{
margin-left
:
auto
;
margin-right
:
-20px
;
}
.monaco-menu
.monaco-action-bar.vertical
.action-item.disabled
.keybinding
,
...
...
@@ -94,14 +103,15 @@
.monaco-menu
.monaco-action-bar.vertical
.menu-item-check
{
position
:
absolute
;
visibility
:
hidden
;
mask
:
url('check.svg')
no-repeat
50%
56%
/
15px
15px
;
-webkit-mask
:
url('check.svg')
no-repeat
50%
56%
/
15px
15px
;
width
:
1em
;
height
:
100%
;
}
.monaco-menu
.monaco-action-bar.vertical
.action-menu-item.checked
.menu-item-check
{
visibility
:
visible
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
/* Context Menu */
...
...
@@ -186,9 +196,6 @@
}
.menubar
.toolbar-toggle-more
{
background-position
:
center
;
background-repeat
:
no-repeat
;
background-size
:
14px
;
width
:
20px
;
height
:
100%
;
}
...
...
@@ -197,21 +204,18 @@
position
:
absolute
;
left
:
0px
;
top
:
0px
;
background-position
:
center
;
background-repeat
:
no-repeat
;
background-size
:
16px
;
cursor
:
pointer
;
width
:
100%
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
.menubar
.toolbar-toggle-more
{
display
:
inline-block
;
padding
:
0
;
mask
:
url('ellipsis.svg')
no-repeat
50%
55%
/
14px
14px
;
-webkit-mask
:
url('ellipsis.svg')
no-repeat
50%
55%
/
14px
14px
;
vertical-align
:
sub
;
}
.menubar.compact
.toolbar-toggle-more
{
mask
:
url('menu.svg')
no-repeat
50%
55%
/
16px
16px
;
-webkit-mask
:
url('menu.svg')
no-repeat
50%
55%
/
16px
16px
;
.menubar.compact
.toolbar-toggle-more
::before
{
content
:
"\eb94"
!important
;
}
src/vs/base/browser/ui/menu/menu.ts
浏览文件 @
5854f63f
...
...
@@ -422,7 +422,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
}
}
this
.
check
=
append
(
this
.
item
,
$
(
'
span.menu-item-check
'
));
this
.
check
=
append
(
this
.
item
,
$
(
'
span.menu-item-check
.codicon.codicon-check
'
));
this
.
check
.
setAttribute
(
'
role
'
,
'
none
'
);
this
.
label
=
append
(
this
.
item
,
$
(
'
span.action-label
'
));
...
...
@@ -602,7 +602,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
}
if
(
this
.
check
)
{
this
.
check
.
style
.
backgroundC
olor
=
fgColor
?
`
${
fgColor
}
`
:
''
;
this
.
check
.
style
.
c
olor
=
fgColor
?
`
${
fgColor
}
`
:
''
;
}
if
(
this
.
container
)
{
...
...
@@ -662,7 +662,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
addClass
(
this
.
item
,
'
monaco-submenu-item
'
);
this
.
item
.
setAttribute
(
'
aria-haspopup
'
,
'
true
'
);
this
.
updateAriaExpanded
(
'
false
'
);
this
.
submenuIndicator
=
append
(
this
.
item
,
$
(
'
span.submenu-indicator
'
));
this
.
submenuIndicator
=
append
(
this
.
item
,
$
(
'
span.submenu-indicator
.codicon.codicon-chevron-right
'
));
this
.
submenuIndicator
.
setAttribute
(
'
aria-hidden
'
,
'
true
'
);
}
...
...
@@ -822,7 +822,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
const
fgColor
=
isSelected
&&
this
.
menuStyle
.
selectionForegroundColor
?
this
.
menuStyle
.
selectionForegroundColor
:
this
.
menuStyle
.
foregroundColor
;
if
(
this
.
submenuIndicator
)
{
this
.
submenuIndicator
.
style
.
backgroundC
olor
=
fgColor
?
`
${
fgColor
}
`
:
''
;
this
.
submenuIndicator
.
style
.
c
olor
=
fgColor
?
`
${
fgColor
}
`
:
''
;
}
if
(
this
.
parentData
.
submenu
)
{
...
...
src/vs/base/browser/ui/menu/menubar.ts
浏览文件 @
5854f63f
...
...
@@ -310,7 +310,7 @@ export class MenuBar extends Disposable {
createOverflowMenu
():
void
{
const
label
=
this
.
options
.
compactMode
!==
undefined
?
nls
.
localize
(
'
mAppMenu
'
,
'
Application Menu
'
)
:
nls
.
localize
(
'
mMore
'
,
"
...
"
);
const
buttonElement
=
$
(
'
div.menubar-menu-button
'
,
{
'
role
'
:
'
menuitem
'
,
'
tabindex
'
:
-
1
,
'
aria-label
'
:
label
,
'
title
'
:
label
,
'
aria-haspopup
'
:
true
});
const
titleElement
=
$
(
'
div.menubar-menu-title.toolbar-toggle-more
'
,
{
'
role
'
:
'
none
'
,
'
aria-hidden
'
:
true
});
const
titleElement
=
$
(
'
div.menubar-menu-title.toolbar-toggle-more
.codicon.codicon-more
'
,
{
'
role
'
:
'
none
'
,
'
aria-hidden
'
:
true
});
buttonElement
.
appendChild
(
titleElement
);
this
.
container
.
appendChild
(
buttonElement
);
...
...
src/vs/base/browser/ui/menu/submenu.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
>
<path
d=
"M4.52051 12.3643L9.87793 7L4.52051 1.635742L5.13574 1.0205078L11.1221 7L5.13574 12.9795L4.52051 12.3643Z"
fill=
"black"
/>
</svg>
src/vs/workbench/browser/parts/titlebar/media/chrome-close-dark.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"11"
height=
"11"
viewBox=
"0 0 11 11"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z"
fill=
"#fff"
/></svg>
\ No newline at end of file
src/vs/workbench/browser/parts/titlebar/media/chrome-close.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"11"
height=
"11"
viewBox=
"0 0 11 11"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z"
fill=
"#000"
/></svg>
\ No newline at end of file
src/vs/workbench/browser/parts/titlebar/media/chrome-maximize-dark.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"11"
height=
"11"
viewBox=
"0 0 11 11"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M11 0v11H0V0h11zM9.899 1.101H1.1V9.9H9.9V1.1z"
fill=
"#fff"
/></svg>
\ No newline at end of file
src/vs/workbench/browser/parts/titlebar/media/chrome-maximize.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"11"
height=
"11"
viewBox=
"0 0 11 11"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M11 0v11H0V0h11zM9.899 1.101H1.1V9.9H9.9V1.1z"
fill=
"#000"
/></svg>
\ No newline at end of file
src/vs/workbench/browser/parts/titlebar/media/chrome-minimize-dark.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"11"
height=
"11"
viewBox=
"0 0 11 11"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M11 4.399V5.5H0V4.399h11z"
fill=
"#fff"
/></svg>
\ No newline at end of file
src/vs/workbench/browser/parts/titlebar/media/chrome-minimize.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"11"
height=
"11"
viewBox=
"0 0 11 11"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M11 4.399V5.5H0V4.399h11z"
fill=
"#000"
/></svg>
\ No newline at end of file
src/vs/workbench/browser/parts/titlebar/media/chrome-restore-dark.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"11"
height=
"11"
viewBox=
"0 0 11 11"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M11 8.798H8.798V11H0V2.202h2.202V0H11v8.798zm-3.298-5.5h-6.6v6.6h6.6v-6.6zM9.9 1.1H3.298v1.101h5.5v5.5h1.1v-6.6z"
fill=
"#fff"
/></svg>
\ No newline at end of file
src/vs/workbench/browser/parts/titlebar/media/chrome-restore.svg
已删除
100644 → 0
浏览文件 @
ec654dbd
<svg
width=
"11"
height=
"11"
viewBox=
"0 0 11 11"
fill=
"none"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M11 8.798H8.798V11H0V2.202h2.202V0H11v8.798zm-3.298-5.5h-6.6v6.6h6.6v-6.6zM9.9 1.1H3.298v1.101h5.5v5.5h1.1v-6.6z"
fill=
"#000"
/></svg>
\ No newline at end of file
src/vs/workbench/browser/parts/titlebar/menubarControl.ts
浏览文件 @
5854f63f
...
...
@@ -333,7 +333,7 @@ export class CustomMenubarControl extends MenubarControl {
}
.monaco-workbench .menubar .toolbar-toggle-more {
background-
color:
${
menubarActiveWindowFgColor
}
color:
${
menubarActiveWindowFgColor
}
}
`
);
}
...
...
@@ -346,7 +346,7 @@ export class CustomMenubarControl extends MenubarControl {
}
.monaco-workbench .menubar.compact .toolbar-toggle-more {
background-
color:
${
activityBarInactiveFgColor
}
color:
${
activityBarInactiveFgColor
}
}
`
);
...
...
@@ -357,14 +357,11 @@ export class CustomMenubarControl extends MenubarControl {
collector
.
addRule
(
`
.monaco-workbench .menubar.compact > .menubar-menu-button.open,
.monaco-workbench .menubar.compact > .menubar-menu-button:focus,
.monaco-workbench .menubar.compact:not(:focus-within) > .menubar-menu-button:hover {
color:
${
activityBarFgColor
}
;
}
.monaco-workbench .menubar.compact:not(:focus-within) > .menubar-menu-button:hover,
.monaco-workbench .menubar.compact > .menubar-menu-button.open .toolbar-toggle-more,
.monaco-workbench .menubar.compact > .menubar-menu-button:focus .toolbar-toggle-more,
.monaco-workbench .menubar.compact:not(:focus-within) > .menubar-menu-button:hover .toolbar-toggle-more {
background-color:
${
activityBarFgColor
}
color:
${
activityBarFgColor
}
;
}
`
);
}
...
...
@@ -372,13 +369,10 @@ export class CustomMenubarControl extends MenubarControl {
const
menubarInactiveWindowFgColor
=
theme
.
getColor
(
TITLE_BAR_INACTIVE_FOREGROUND
);
if
(
menubarInactiveWindowFgColor
)
{
collector
.
addRule
(
`
.monaco-workbench .menubar.inactive:not(.compact) > .menubar-menu-button {
.monaco-workbench .menubar.inactive:not(.compact) > .menubar-menu-button,
.monaco-workbench .menubar.inactive:not(.compact) > .menubar-menu-button .toolbar-toggle-more {
color:
${
menubarInactiveWindowFgColor
}
;
}
.monaco-workbench .menubar.inactive:not(.compact) > .menubar-menu-button .toolbar-toggle-more {
background-color:
${
menubarInactiveWindowFgColor
}
}
`
);
}
...
...
@@ -388,14 +382,11 @@ export class CustomMenubarControl extends MenubarControl {
collector
.
addRule
(
`
.monaco-workbench .menubar:not(.compact) > .menubar-menu-button.open,
.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus,
.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover {
color:
${
menubarSelectedFgColor
}
;
}
.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover,
.monaco-workbench .menubar:not(.compact) > .menubar-menu-button.open .toolbar-toggle-more,
.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus .toolbar-toggle-more,
.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover .toolbar-toggle-more {
background-color:
${
menubarSelectedFgColor
}
color:
${
menubarSelectedFgColor
}
;
}
`
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录