Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
后端镜像
Tabby
提交
204c1057
T
Tabby
项目概览
后端镜像
/
Tabby
通知
31
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Tabby
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
204c1057
编写于
12月 06, 2020
作者:
E
Eugene
提交者:
GitHub
12月 06, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3084 from TakuroOnoda/feature/sidetab
上级
f56dd71f
dff6a247
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
84 addition
and
11 deletion
+84
-11
terminus-core/src/components/appRoot.component.pug
terminus-core/src/components/appRoot.component.pug
+9
-3
terminus-core/src/components/appRoot.component.scss
terminus-core/src/components/appRoot.component.scss
+47
-1
terminus-core/src/components/appRoot.component.ts
terminus-core/src/components/appRoot.component.ts
+4
-0
terminus-core/src/components/tabHeader.component.scss
terminus-core/src/components/tabHeader.component.scss
+5
-0
terminus-settings/src/components/settingsTab.component.pug
terminus-settings/src/components/settingsTab.component.pug
+16
-2
terminus-settings/src/components/settingsTab.component.ts
terminus-settings/src/components/settingsTab.component.ts
+1
-1
terminus-ssh/package.json
terminus-ssh/package.json
+1
-3
terminus-terminal/src/api/baseTerminalTab.component.ts
terminus-terminal/src/api/baseTerminalTab.component.ts
+1
-1
未找到文件。
terminus-core/src/components/appRoot.component.pug
浏览文件 @
204c1057
...
...
@@ -4,11 +4,15 @@ title-bar(
)
.content(
[class.tabs-on-top]='config.store.appearance.tabsLocation == "top"'
[class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"',
[class.tabs-on-side]='hasVerticalTabs()',
)
.tab-bar
.inset.background(*ngIf='hostApp.platform == Platform.macOS && config.store.appearance.frame == "thin" && config.store.appearance.tabsLocation == "top"')
.inset.background(*ngIf='hostApp.platform == Platform.macOS \
&& config.store.appearance.frame == "thin" \
&& (config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left")')
.tabs(
*ngIf='config.store.appearance.tabsLocation != "bottom"'
dnd-sortable-container,
[sortableData]='app.tabs',
)
...
...
@@ -24,6 +28,7 @@ title-bar(
[active]='tab == app.activeTab',
[hasActivity]='tab.activity$|async',
@animateTab,
[@.disabled]='hasVerticalTabs()',
(click)='app.selectTab(tab)',
[class.fully-draggable]='hostApp.platform != Platform.macOS',
[class.drag-region]='hostApp.platform == Platform.macOS && !tabsDragging',
...
...
@@ -87,7 +92,8 @@ title-bar(
)
window-controls.background(
*ngIf='config.store.appearance.frame == "thin" && (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',
*ngIf='config.store.appearance.frame == "thin" \
&& (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',
)
start-page(*ngIf='ready && app.tabs.length == 0')
...
...
terminus-core/src/components/appRoot.component.scss
浏览文件 @
204c1057
...
...
@@ -15,10 +15,18 @@
$tabs-height
:
38px
;
$tab-border-radius
:
4px
;
$side-tab-width
:
200px
;
.wrap
{
display
:
flex
;
width
:
100vw
;
height
:
100vh
;
flex-direction
:
row
;
}
.content
{
height
:
100%
;
width
:
100vw
;
height
:
100vh
;
flex
:
auto
;
display
:
flex
;
flex-direction
:
column-reverse
;
...
...
@@ -26,15 +34,50 @@ $tab-border-radius: 4px;
&
.tabs-on-top
{
flex-direction
:
column
;
}
&
.tabs-on-side
{
flex-direction
:
row-reverse
;
&
.tabs-on-top
{
flex-direction
:
row
;
}
}
}
.content.tabs-on-side
>
.tab-bar
{
height
:
100%
;
width
:
$side-tab-width
;
overflow-y
:
auto
;
overflow-x
:
hidden
;
flex-direction
:
column
;
background
:
rgba
(
0
,
0
,
0
,
0
.25
);
.tabs
{
width
:
$side-tab-width
;
flex
:
none
;
flex-direction
:
column
;
tab-header
{
flex
:
0
0
$tabs-height
;
}
}
.drag-space
{
flex
:
auto
;
}
}
.tab-bar
{
flex
:
none
;
height
:
$tabs-height
;
display
:
flex
;
width
:
100%
;
.btn-tab-bar
{
line-height
:
$tabs-height
+
2px
;
height
:
$tabs-height
;
cursor
:
pointer
;
display
:
flex
;
...
...
@@ -74,7 +117,10 @@ $tab-border-radius: 4px;
&
>
.inset
{
width
:
85px
;
height
:
$tabs-height
;
flex
:
none
;
opacity
:
0
;
-webkit-app-region
:
drag
;
}
window-controls
{
...
...
terminus-core/src/components/appRoot.component.ts
浏览文件 @
204c1057
...
...
@@ -184,6 +184,10 @@ export class AppRootComponent {
return
false
}
hasVerticalTabs
()
{
return
this
.
config
.
store
.
appearance
.
tabsLocation
===
'
left
'
||
this
.
config
.
store
.
appearance
.
tabsLocation
===
'
right
'
}
async
updateApp
()
{
if
((
await
this
.
electron
.
showMessageBox
(
this
.
hostApp
.
getWindow
(),
...
...
terminus-core/src/components/tabHeader.component.scss
浏览文件 @
204c1057
...
...
@@ -13,6 +13,11 @@ $tabs-height: 38px;
overflow
:
hidden
;
&
.vertical
{
flex
:
none
;
height
:
$tabs-height
;
}
.index
{
flex
:
none
;
font-weight
:
bold
;
...
...
terminus-settings/src/components/settingsTab.component.pug
浏览文件 @
204c1057
...
...
@@ -43,14 +43,28 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
ngbButton,
[value]='"top"'
)
|
On the t
op
|
T
op
label.btn.btn-secondary(ngbButtonLabel)
input(
type='radio',
ngbButton,
[value]='"bottom"'
)
| At the bottom
| Bottom
label.btn.btn-secondary(ngbButtonLabel)
input(
type='radio',
ngbButton,
[value]='"left"'
)
| Left
label.btn.btn-secondary(ngbButtonLabel)
input(
type='radio',
ngbButton,
[value]='"right"'
)
| Right
.form-line
.header
...
...
terminus-settings/src/components/settingsTab.component.ts
浏览文件 @
204c1057
...
...
@@ -65,7 +65,7 @@ export class SettingsTabComponent extends BaseTabComponent {
const
onConfigChange
=
()
=>
{
this
.
configFile
=
config
.
readRaw
()
this
.
padWindowControls
=
hostApp
.
platform
===
Platform
.
macOS
&&
config
.
store
.
appearance
.
tabsLocation
===
'
bottom
'
&&
config
.
store
.
appearance
.
tabsLocation
!==
'
top
'
}
this
.
configSubscription
=
config
.
changed$
.
subscribe
(
onConfigChange
)
...
...
terminus-ssh/package.json
浏览文件 @
204c1057
...
...
@@ -10,9 +10,7 @@
"scripts"
:
{
"build"
:
"webpack --progress --color"
,
"watch"
:
"webpack --progress --color --watch"
,
"postinstall"
:
"run-script-os"
,
"postinstall:win32"
:
"xcopy /i node_modules
\\
ssh2
\\
util
\\
pagent.exe util
\\
"
,
"postinstall:darwin:linux"
:
"exit"
"postinstall"
:
"xcopy /i /y node_modules
\\
ssh2
\\
util
\\
pagent.exe util
\\
"
},
"files"
:
[
"dist"
,
...
...
terminus-terminal/src/api/baseTerminalTab.component.ts
浏览文件 @
204c1057
...
...
@@ -360,7 +360,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
this
.
topPadded
=
this
.
hostApp
.
platform
===
Platform
.
macOS
&&
this
.
config
.
store
.
appearance
.
frame
===
'
thin
'
&&
this
.
config
.
store
.
appearance
.
tabsLocation
===
'
bottom
'
&&
this
.
config
.
store
.
appearance
.
tabsLocation
!==
'
top
'
if
(
this
.
config
.
store
.
terminal
.
background
===
'
colorScheme
'
)
{
if
(
this
.
config
.
store
.
terminal
.
colorScheme
.
background
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录