Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
6ec25608
D
dashboard
项目概览
凌波微步_大先生
/
dashboard
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dashboard
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6ec25608
编写于
6月 21, 2016
作者:
P
Piotr Bryk
提交者:
GitHub
6月 21, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #928 from bryk/safari-fixes
Fix layout issues on Safari plus make logs toolbar work
上级
7e73d9b7
f03b301b
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
14 addition
and
27 deletion
+14
-27
i18n/messages-ja.xtb
i18n/messages-ja.xtb
+1
-1
src/app/frontend/chrome/chrome.html
src/app/frontend/chrome/chrome.html
+1
-1
src/app/frontend/chrome/chrome.scss
src/app/frontend/chrome/chrome.scss
+0
-5
src/app/frontend/common/components/resourcecard/resourcecard.html
...frontend/common/components/resourcecard/resourcecard.html
+1
-1
src/app/frontend/common/namespace/namespaceselect.html
src/app/frontend/common/namespace/namespaceselect.html
+2
-4
src/app/frontend/common/namespace/namespaceselect.scss
src/app/frontend/common/namespace/namespaceselect.scss
+0
-9
src/app/frontend/logs/logstoolbar/logstoolbar.html
src/app/frontend/logs/logstoolbar/logstoolbar.html
+8
-2
src/app/frontend/logs/logstoolbar/logstoolbar_controller.js
src/app/frontend/logs/logstoolbar/logstoolbar_controller.js
+1
-4
未找到文件。
i18n/messages-ja.xtb
浏览文件 @
6ec25608
src/app/frontend/chrome/chrome.html
浏览文件 @
6ec25608
...
@@ -27,7 +27,7 @@ limitations under the License.
...
@@ -27,7 +27,7 @@ limitations under the License.
</div>
</div>
</md-toolbar>
</md-toolbar>
<kd-actionbar
ng-if=
"$ctrl.isActionbarVisible()"
></kd-actionbar>
<kd-actionbar
ng-if=
"$ctrl.isActionbarVisible()"
flex=
"none"
></kd-actionbar>
<md-content
flex=
"auto"
class=
"kd-app-content"
>
<md-content
flex=
"auto"
class=
"kd-app-content"
>
<div
ng-switch=
"$ctrl.showLoadingSpinner"
flex=
"auto"
>
<div
ng-switch=
"$ctrl.showLoadingSpinner"
flex=
"auto"
>
...
...
src/app/frontend/chrome/chrome.scss
浏览文件 @
6ec25608
...
@@ -28,11 +28,6 @@
...
@@ -28,11 +28,6 @@
box-shadow
:
$whiteframe-shadow-1dp
;
box-shadow
:
$whiteframe-shadow-1dp
;
}
}
chrome
{
display
:
block
;
overflow
:
hidden
;
}
body
,
body
,
.kd-app-content
{
.kd-app-content
{
background-color
:
$body
;
background-color
:
$body
;
...
...
src/app/frontend/common/components/resourcecard/resourcecard.html
浏览文件 @
6ec25608
...
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
...
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
-->
-->
<div
class=
"kd-resource-card"
layout=
"column"
>
<div
class=
"kd-resource-card"
>
<div
layout=
"row"
class=
"kd-resource-card-columns-container"
flex=
"grow"
>
<div
layout=
"row"
class=
"kd-resource-card-columns-container"
flex=
"grow"
>
<div
ng-if=
"$ctrl.isSelectable()"
flex=
"none"
class=
"kd-resource-card-select"
>
<div
ng-if=
"$ctrl.isSelectable()"
flex=
"none"
class=
"kd-resource-card-select"
>
<md-checkbox
aria-label=
"Select the resource"
></md-checkbox>
<md-checkbox
aria-label=
"Select the resource"
></md-checkbox>
...
...
src/app/frontend/common/namespace/namespaceselect.html
浏览文件 @
6ec25608
...
@@ -9,10 +9,8 @@
...
@@ -9,10 +9,8 @@
<md-option
ng-value=
"::$ctrl.NAMESPACE_NOT_SELECTED"
class=
"kd-namespace-select-all"
>
<md-option
ng-value=
"::$ctrl.NAMESPACE_NOT_SELECTED"
class=
"kd-namespace-select-all"
>
{{::$ctrl.i18n.MSG_NAMESPACE_NOT_SELECTED}}
{{::$ctrl.i18n.MSG_NAMESPACE_NOT_SELECTED}}
</md-option>
</md-option>
<md-select-header
class=
"kd-namespace-list-header"
>
<md-optgroup
label=
"{{::$ctrl.i18n.MSG_NAMESPACE_LIST_LABEL}}"
{{::$ctrl.i18n.MSG_NAMESPACE_LIST_LABEL}}
class=
"kd-namespace-select-namespace-list"
>
</md-select-header>
<md-optgroup
label=
"namespaces"
class=
"kd-namespace-select-namespace-list"
>
<md-option
ng-value=
"namespace"
ng-repeat=
"namespace in $ctrl.namespaces"
>
<md-option
ng-value=
"namespace"
ng-repeat=
"namespace in $ctrl.namespaces"
>
{{::namespace}}
{{::namespace}}
</md-option>
</md-option>
...
...
src/app/frontend/common/namespace/namespaceselect.scss
浏览文件 @
6ec25608
...
@@ -43,15 +43,6 @@ md-select {
...
@@ -43,15 +43,6 @@ md-select {
}
}
}
}
.kd-namespace-list-header
{
color
:
$foreground-2
;
display
:
block
;
font-size
:
$body-font-size-base
;
font-weight
:
$bold-font-weight
;
padding
:
2
*
$baseline-grid
;
text-transform
:
uppercase
;
}
.kd-namespace-select-all
{
.kd-namespace-select-all
{
height
:
$table-cell-height
;
height
:
$table-cell-height
;
min-height
:
$table-cell-height
;
min-height
:
$table-cell-height
;
...
...
src/app/frontend/logs/logstoolbar/logstoolbar.html
浏览文件 @
6ec25608
...
@@ -14,9 +14,15 @@ See the License for the specific language governing permissions and
...
@@ -14,9 +14,15 @@ See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
-->
-->
<div
layout=
"row"
hide
show-gt-sm
layout-margin
layout-align=
"center center"
<div
layout=
"row"
layout-margin
layout-align=
"center center"
class=
"kd-logs-toolbar"
>
class=
"kd-logs-toolbar"
>
<span
class=
"kd-logs-toolbar-text"
>
{{::ctrl.i18n.MSG_LOGS_POD_LABEL}}
</span>
<div
class=
"kd-logs-toolbar-text"
flex=
"none"
>
<span>
{{::ctrl.i18n.MSG_LOGS_POD_LABEL}}
</span>
</div>
<div
class=
"kd-logs-toolbar-text"
flex=
"shrink"
>
<kd-middle-ellipsis
display-string=
"{{::ctrl.stateParams.objectName}}"
>
</kd-middle-ellipsis>
</div>
<span
class=
"kd-logs-toolbar-text"
>
{{::ctrl.i18n.MSG_LOGS_CONTAINER_LABEL}}
</span>
<span
class=
"kd-logs-toolbar-text"
>
{{::ctrl.i18n.MSG_LOGS_CONTAINER_LABEL}}
</span>
<md-select
class=
"kd-logs-toolbar-select"
aria-label=
"Containers"
ng-model=
"ctrl.container"
<md-select
class=
"kd-logs-toolbar-select"
aria-label=
"Containers"
ng-model=
"ctrl.container"
...
...
src/app/frontend/logs/logstoolbar/logstoolbar_controller.js
浏览文件 @
6ec25608
...
@@ -42,10 +42,7 @@ export default class LogsToolbarController {
...
@@ -42,10 +42,7 @@ export default class LogsToolbarController {
/** @export {string} */
/** @export {string} */
this
.
container
=
$stateParams
.
container
||
this
.
containers
[
0
];
this
.
container
=
$stateParams
.
container
||
this
.
containers
[
0
];
/**
/** @export {../logs_state.StateParams} */
* @export {../logs_state.StateParams}
*/
this
.
stateParams
=
$stateParams
;
this
.
stateParams
=
$stateParams
;
/** @export */
/** @export */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录