提交 f03b301b 编写于 作者: B bryk

Fix layout issues on Safari plus make logs toolbar work

The issues were all around Safari. The logs toolbar didn't display pod name; now it displays.

Fixes: #828
上级 7e73d9b7
......@@ -643,4 +643,4 @@
<translation id="7635451132574422294" key="MSG_DEPLOYMENT_DETAIL_REVISION_HISTORY_LABEL" source="/usr/local/google/home/bryk/src/github.com/dashboard/.tmp/serve/app-dev.js" desc="Label for the deployment property on the deployment details page.">改版履歴の上限</translation>
<translation id="1510317375939332648" key="MSG_DEPLOYMENT_DETAIL_REVISION_HISTORY_NOT_SET_LABEL" source="/usr/local/google/home/bryk/src/github.com/dashboard/.tmp/serve/app-dev.js" desc="Label for the when revision history limit is not set.">未設定</translation>
<translation id="7938484755085065281" key="MSG_DEPLOYMENT_DETAIL_ROLLING_STRATEGY_LABEL" source="/usr/local/google/home/bryk/src/github.com/dashboard/.tmp/serve/app-dev.js" desc="Label 'Rolling Update Strategy' for the deployment's rolling update strategy on the deployment details page.">ローリングアップデートストラテジー</translation>
</translationbundle>
</translationbundle>
\ No newline at end of file
......@@ -27,7 +27,7 @@ limitations under the License.
</div>
</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">
<div ng-switch="$ctrl.showLoadingSpinner" flex="auto" >
......
......@@ -28,11 +28,6 @@
box-shadow: $whiteframe-shadow-1dp;
}
chrome {
display: block;
overflow: hidden;
}
body,
.kd-app-content {
background-color: $body;
......
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
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 ng-if="$ctrl.isSelectable()" flex="none" class="kd-resource-card-select">
<md-checkbox aria-label="Select the resource"></md-checkbox>
......
......@@ -9,10 +9,8 @@
<md-option ng-value="::$ctrl.NAMESPACE_NOT_SELECTED" class="kd-namespace-select-all">
{{::$ctrl.i18n.MSG_NAMESPACE_NOT_SELECTED}}
</md-option>
<md-select-header class="kd-namespace-list-header">
{{::$ctrl.i18n.MSG_NAMESPACE_LIST_LABEL}}
</md-select-header>
<md-optgroup label="namespaces" class="kd-namespace-select-namespace-list">
<md-optgroup label="{{::$ctrl.i18n.MSG_NAMESPACE_LIST_LABEL}}"
class="kd-namespace-select-namespace-list">
<md-option ng-value="namespace" ng-repeat="namespace in $ctrl.namespaces">
{{::namespace}}
</md-option>
......
......@@ -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 {
height: $table-cell-height;
min-height: $table-cell-height;
......
......@@ -14,9 +14,15 @@ See the License for the specific language governing permissions and
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">
<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>
<md-select class="kd-logs-toolbar-select" aria-label="Containers" ng-model="ctrl.container"
......
......@@ -42,10 +42,7 @@ export default class LogsToolbarController {
/** @export {string} */
this.container = $stateParams.container || this.containers[0];
/**
* @export {../logs_state.StateParams}
*/
/** @export {../logs_state.StateParams} */
this.stateParams = $stateParams;
/** @export */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册