Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
c9c1bc1f
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,发现更多精彩内容 >>
提交
c9c1bc1f
编写于
3月 08, 2016
作者:
S
Sebastian Florek
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #491 from floreks/logs-fix
Fixed styling issues on logs page and made it more responsive
上级
8cfcf64f
481bc36c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
94 addition
and
27 deletion
+94
-27
.sass-lint.yml
.sass-lint.yml
+1
-1
src/app/frontend/chrome/chrome.scss
src/app/frontend/chrome/chrome.scss
+1
-1
src/app/frontend/logs/logstoolbar/logstoolbar.html
src/app/frontend/logs/logstoolbar/logstoolbar.html
+65
-25
src/app/frontend/logs/logstoolbar/logstoolbar.scss
src/app/frontend/logs/logstoolbar/logstoolbar.scss
+27
-0
未找到文件。
.sass-lint.yml
浏览文件 @
c9c1bc1f
...
@@ -41,7 +41,7 @@ rules:
...
@@ -41,7 +41,7 @@ rules:
no-empty-rulesets
:
2
no-empty-rulesets
:
2
no-extends
:
0
no-extends
:
0
no-ids
:
2
no-ids
:
2
no-important
:
2
no-important
:
0
no-invalid-hex
:
2
no-invalid-hex
:
2
no-mergeable-selectors
:
2
no-mergeable-selectors
:
2
no-misspelled-properties
:
2
no-misspelled-properties
:
2
...
...
src/app/frontend/chrome/chrome.scss
浏览文件 @
c9c1bc1f
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
.kd-toolbar
{
.kd-toolbar
{
box-shadow
:
$whiteframe-shadow-1dp
;
box-shadow
:
$whiteframe-shadow-1dp
;
height
:
$toolbar-height-size-base
;
height
:
$toolbar-height-size-base
;
position
:
fixed
;
position
:
fixed
!
important
;
top
:
0
;
top
:
0
;
}
}
...
...
src/app/frontend/logs/logstoolbar/logstoolbar.html
浏览文件 @
c9c1bc1f
...
@@ -14,28 +14,27 @@ See the License for the specific language governing permissions and
...
@@ -14,28 +14,27 @@ See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
-->
-->
<div
layout=
"row"
layout-wrap
layout-margin
layout-align=
"center center"
>
<div
layout=
"row"
hide
show-gt-sm
layout-margin
layout-align=
"center center"
<span
flex=
"10"
></span>
class=
"kd-logs-toolbar"
>
<span
class=
"kd-logs-toolbar-text"
>
Pod:
</span>
<div
layout=
"row"
layout-wrap
layout-margin
layout-align=
"center center"
>
<md-select
class=
"kd-logs-toolbar-select"
aria-label=
"Logs from pod"
ng-model=
"ctrl.pod"
<span
class=
"kd-logs-toolbar-text"
>
Logs from pod:
</span>
md-on-close=
"ctrl.onPodChange(ctrl.pod.name)"
<md-select
class=
"kd-logs-toolbar-select"
aria-label=
"Logs from pod"
ng-model=
"ctrl.pod"
required
>
md-on-close=
"ctrl.onPodChange(ctrl.pod.name)"
<md-option
ng-repeat=
"item in ctrl.pods"
ng-value=
"item"
>
required
>
<span
class=
"kd-logs-toolbar-text"
>
{{item.name}}
</span>
<md-option
ng-repeat=
"item in ctrl.pods"
ng-value=
"item"
>
</md-option>
<span
class=
"kd-logs-toolbar-text"
>
{{item.name}}
</span>
</md-select>
</md-option>
</md-select>
<span
class=
"kd-logs-toolbar-text"
>
Container:
</span>
<span
class=
"kd-logs-toolbar-text"
>
Container:
</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"
md-on-close=
"ctrl.onContainerChange(ctrl.container.name)"
md-on-close=
"ctrl.onContainerChange(ctrl.container.name)"
required
>
required
>
<md-option
ng-repeat=
"item in ctrl.containers"
ng-value=
"item"
>
<md-option
ng-repeat=
"item in ctrl.containers"
ng-value=
"item"
>
<span
class=
"kd-logs-toolbar-text"
>
{{item.name}}
</span>
<span
class=
"kd-logs-toolbar-text"
>
{{item.name}}
</span>
</md-option>
</md-option>
</md-select>
</md-select>
</div>
<span
class=
"kd-logs-toolbar-text"
flex=
"auto"
>
<span
class=
"kd-logs-toolbar-text"
flex=
"auto"
>
<span
ng-if=
"ctrl.podCreationTime"
>
<span
ng-if=
"ctrl.podCreationTime"
>
Running since {{ctrl.podCreationTime | date:'short'}}
Running since {{ctrl.podCreationTime | date:'short'}}
</span>
</span>
...
@@ -43,9 +42,50 @@ limitations under the License.
...
@@ -43,9 +42,50 @@ limitations under the License.
Not running
Not running
</span>
</span>
</span>
</span>
<span
flex=
"auto"
></span>
<md-button
class=
"kd-icon-button"
id=
"colorText"
<span
flex=
"auto"
></span>
ng-click=
"ctrl.onTextColorChange()"
>
<md-button
ng-click=
"ctrl.onTextColorChange()"
>
<md-icon
md-font-library=
"material-icons"
ng-class=
"ctrl.getStyleClass()"
>
format_color_text
</md-icon>
</md-button>
</div>
<div
layout=
"row"
hide-gt-sm
layout-no-wrap
layout-margin
layout-align=
"center center"
class=
"kd-logs-toolbar"
>
<md-menu-bar
class=
"kd-logs-toolbar-menu-bar"
>
<md-menu>
<button
ng-click=
"$mdOpenMenu()"
class=
"kd-logs-toolbar-menu-button"
>
Logs source
</button>
<md-menu-content
width=
"3"
>
<md-menu-item>
<md-menu>
<md-button
ng-click=
"$mdOpenMenu()"
>
Pods
</md-button>
<md-menu-content
width=
"4"
>
<md-button
ng-repeat=
"item in ctrl.pods"
ng-click=
"ctrl.onPodChange(item.name)"
>
{{item.name}}
</md-button>
</md-menu-content>
</md-menu>
</md-menu-item>
<md-menu-item>
<md-menu>
<md-button
ng-click=
"$mdOpenMenu()"
>
Containers
</md-button>
<md-menu-content
width=
"4"
>
<md-button
ng-repeat=
"item in ctrl.containers"
ng-click=
"ctrl.onContainerChange(item.name)"
>
{{item.name}}
</md-button>
</md-menu-content>
</md-menu>
</md-menu-item>
</md-menu-content>
</md-menu>
</md-menu-bar>
<span
flex=
"auto"
></span>
<md-button
class=
"kd-logs-toolbar-icon"
ng-click=
"ctrl.onTextColorChange()"
>
<md-icon
md-font-library=
"material-icons"
<md-icon
md-font-library=
"material-icons"
ng-class=
"ctrl.getStyleClass()"
>
ng-class=
"ctrl.getStyleClass()"
>
format_color_text
format_color_text
...
...
src/app/frontend/logs/logstoolbar/logstoolbar.scss
浏览文件 @
c9c1bc1f
...
@@ -60,3 +60,30 @@ md-toolbar {
...
@@ -60,3 +60,30 @@ md-toolbar {
}
}
}
}
}
}
.md-button
{
&
.kd-logs-toolbar-icon
{
min-width
:
4
*
$baseline-grid
;
}
}
.kd-logs-toolbar-menu-button
{
color
:
$content-background
;
&
:after
{
content
:
'\25BC'
;
display
:
inline-block
;
position
:
relative
;
transform
:
scaleY
(
.9
)
scaleX
(
1
.3
);
}
}
.kd-logs-toolbar-menu-bar
{
.kd-logs-toolbar-menu-button
{
background
:
none
;
}
}
.kd-logs-toolbar
{
margin-bottom
:
$baseline-grid
/
2
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录