diff --git a/app/components/osc-webhook-triggers/osc-webhook-triggers.html b/app/components/osc-webhook-triggers/osc-webhook-triggers.html index c771579689..842aa9a702 100644 --- a/app/components/osc-webhook-triggers/osc-webhook-triggers.html +++ b/app/components/osc-webhook-triggers/osc-webhook-triggers.html @@ -10,8 +10,7 @@ search-enabled="false" title="Select a webhook type" ng-class="{'has-warning': trigger.isDuplicate }" - focus-on="focus-index-{{$index}}" - flex> + focus-on="focus-index-{{$index}}"> {{ $select.selected.label }} @@ -29,8 +28,7 @@ title="Select a webhook secret reference" ng-class="{'has-error': $ctrl.secretsForm[secretFieldName].$invalid && $ctrl.secretsForm[secretFieldName].$touched}" ng-disabled="!trigger.data.type" - ng-required="trigger.data.type" - flex> + ng-required="trigger.data.type"> {{ $select.selected.metadata.name }} diff --git a/app/index.html b/app/index.html index acf093dba8..1c783d6f85 100644 --- a/app/index.html +++ b/app/index.html @@ -23,7 +23,6 @@ - diff --git a/app/scripts/directives/actionChip.js b/app/scripts/directives/actionChip.js index f51e73b709..b45e92c9cd 100644 --- a/app/scripts/directives/actionChip.js +++ b/app/scripts/directives/actionChip.js @@ -1,22 +1,4 @@ 'use strict'; -//
-//
Chips
-//
-// -// -// -// -//
-//
angular .module('openshiftConsole') .directive('actionChip', function() { diff --git a/app/styles/_catalog.less b/app/styles/_catalog.less index 34b8b2b947..50a07a26f9 100644 --- a/app/styles/_catalog.less +++ b/app/styles/_catalog.less @@ -1,5 +1,10 @@ @bind-service-page-height: 310px; +// old catalog page (/create) +.filter-catalog { + width: 100%; +} + .landing { h1, .nav-tabs { margin-bottom: 0 !important; diff --git a/app/styles/_components.less b/app/styles/_components.less index 15470360ba..8f9e827a91 100644 --- a/app/styles/_components.less +++ b/app/styles/_components.less @@ -35,12 +35,9 @@ margin-top: 15px; } .pod-template { - // so that .word-break() on children works - [flex] { - min-width: 0; - } .icon-row { border-left: 3px solid @gray-lighter; + display: flex; padding: 2px 0 0 2px; } .fa, @@ -51,6 +48,10 @@ .pod-template-build { .word-break(); } + .pod-template-detail { + flex: 1 1 0%; + min-width: 0; // so that .word-break() on children works + } .pod-template-key { font-weight: 600; } @@ -155,10 +156,19 @@ pod-donut[mini] { } .deployment-donut { + display: flex; + flex-direction: column; justify-content: center; .browse-deployment-donut & { align-items: center; } + .deployment-donut-column { + display: flex; + flex-direction: column; + } + .deployment-donut-row { + display: flex; + } .scaling-controls { justify-content: center; font-size: 24px; diff --git a/app/styles/_core.less b/app/styles/_core.less index 7b370f2200..bb145e9acd 100644 --- a/app/styles/_core.less +++ b/app/styles/_core.less @@ -411,6 +411,12 @@ registry-imagestream-meta dt:after { margin: 0 20px; } +.quota-charts { + display: flex; + flex-wrap: wrap; + justify-content: center; +} + .route-service-bar-chart { .service-name, .service-weight { @@ -1097,17 +1103,22 @@ a.disabled-link { } .status { + display: flex; min-width: 130px; + // when status-icon is child of .status, add margin-right to the icon + // because the space resulting from display: inline-block collapses + status-icon { + margin-right: 3px; + } +} + +.status-detail { + flex: 1 1 0%; } build-counts, notification-icon, status-icon { - // when status-icon is child of [row], add margin-right to the icon - // because the space resulting from display: inline-block collapses - [row] > & { - margin-right: 3px; - } // so that status-icons have a fixed width (like .fa-fw, but better sized) // this ensures when the icons change, the text that follows doesn't shift .fa, .pficon { @@ -1144,6 +1155,7 @@ pre.clipped { } .k8s-label { + display: flex; margin-right: 5px; // A bit more space below the actions button. margin-top: 3px; @@ -1153,6 +1165,7 @@ pre.clipped { white-space: normal; } .label-pair { + display: flex; margin-bottom: 2px; max-width: 100%; // needed to enable truncation within table, but still allow inline display if room is available .label { @@ -1209,6 +1222,11 @@ pre.clipped { } } +.k8s-labels { + display: flex; + flex-wrap: wrap; +} + .action-divider { color: @gray-light; padding: 0 6px; @@ -1325,3 +1343,16 @@ pre.clipped { } } } + +.init-container-status-detail { + flex: 1 1 0%; +} + +.init-container-status, +.ui-select-choices-flex { + display: flex; +} + +.ui-select-choices-flex { + justify-content: space-between; +} diff --git a/app/styles/_log.less b/app/styles/_log.less index 4c0a944e5a..8cef73e966 100644 --- a/app/styles/_log.less +++ b/app/styles/_log.less @@ -7,6 +7,9 @@ .h2(); .text-center(); } + log-viewer { + flex: 1 1 0%; + } } .log-title { margin-top: 0; diff --git a/app/styles/_membership.less b/app/styles/_membership.less index a900fae62b..e11ffebb2d 100644 --- a/app/styles/_membership.less +++ b/app/styles/_membership.less @@ -1,88 +1,57 @@ .membership { .action-set { - display: flex; - flex-direction: column; - justify-content: space-between; - width: 100%; - @media(min-width: @screen-sm-min) { - flex-wrap: nowrap; - } - @media(min-width: @screen-md-min) { - flex-direction: row; + flex: 1 1 auto; + @media(min-width: @screen-xs-min) { + max-width: 65%; + .container-pf-nav-pf-vertical.collapsed-nav & { + max-width: 60%; + } } } .content-pane { - width: 100%; .add-role-to { margin-left: -1px; } - .col-add-role { - width: 100%; - @media(min-width: @screen-xs-min) { - min-width: 245px; - width: auto; - } + .col-add-role-inputs { + display: flex; } .col-heading { border-bottom: 1px solid #ededed; display: none; @media(min-width: @screen-xs-min) { display: flex; - margin: 0; } } .col-name { + align-items: center; + display: flex; + flex: 1 1 auto; + padding: 0 0 10px 0; + .word-break-all; @media(min-width: @screen-xs-min) { - max-width: 30%; + max-width: 35%; + padding: 0 5px 0 0; + width: 100%; .container-pf-nav-pf-vertical.collapsed-nav & { max-width: 40%; } - padding: 0 5px 0 0; input { max-width: 225px; } } - &.half-width { - max-width: 50%; - } - .word-break-all; - padding: 0 0px 10px 0; - width: 100%; - .new-project { - margin-top: 2px; - } } .col-roles { display: flex; flex-wrap: wrap; padding-bottom: 5px; - @media(min-width: @screen-md-min) { - padding: 0; - } - } - .content-serviceaccount .form-new-role .col-roles { - display: block; - } - .form-new-role { - .col-roles { - display: none; - } - @media(min-width: @screen-md-min) { - .action-set { - flex-direction: column; - .col-add-role { - align-self: flex-end; - } - } - } - } - .input-name { - margin-bottom: 5px; } .item-row { border-bottom: 1px solid #ededed; - padding: 10px 10px 10px 5px; + display: flex; + flex-direction: column; + padding: 10px 0; @media(min-width: @screen-xs-min) { + flex-direction: row; &.highlight-hover:hover { background-color: #fafafa; } @@ -91,51 +60,31 @@ .membership-empty { margin-top: 20px; } - .show-hidden-roles .action-set { - display: flex; - flex-direction: row; - justify-content: flex-end; - } - .select-project { - width: 150px; + .show-hidden-roles { + text-align: right; } .select-role { + flex: 1 1 auto; + .active { + small { + color: #c0e0f0; + } + } small { color: #999; display: inline-block; line-height: 1.4; white-space: pre-line; } - .active { - small { - color: #c0e0f0; - } - } } .service-account { - @media(max-width: @screen-sm-max) { - flex-direction: column; // stack inputs because lack of horizontal space - } - .select-role { - padding-bottom: 5px; - width: auto; - @media(min-width: @screen-md-min) { - width: 150px; - } + flex-wrap: wrap; + margin-bottom: -5px; + .select-project, + .select-service-account { + margin-bottom: 5px; } } - // FIXME (bpeterse): to update in layout.attrs & eliminate the workaround here - // fix for collapse of flex items in IE - // https://github.com/philipwalton/flexbugs#1-minimum-content-sizing-of-flex-items-not-honored - [flex-collapse-fix], - [flex], // fixes ie flex-direction: column collapse issue - .col-add-role, - .col-heading, - .col-name, - .item-row { - flex-shrink: 0; - flex-basis: auto; - } } // allow for taller select due to role help text .ui-select-bootstrap > .ui-select-choices { diff --git a/app/styles/_overview.less b/app/styles/_overview.less index 7d6cef047c..8aaf517c51 100644 --- a/app/styles/_overview.less +++ b/app/styles/_overview.less @@ -243,9 +243,6 @@ } } .list-pf-expansion.in { - .deployment-donut > div[row] { - justify-content: center; - } .empty-state-message { margin-bottom: 30px; margin-top: 20px; diff --git a/app/styles/_pipeline.less b/app/styles/_pipeline.less index 4a5c800e2c..a73fa72a90 100644 --- a/app/styles/_pipeline.less +++ b/app/styles/_pipeline.less @@ -265,6 +265,7 @@ } .build-pipeline { display: flex; + flex: 1 1 0%; flex-direction: row; .build-name { white-space: nowrap; diff --git a/app/views/_container-statuses.html b/app/views/_container-statuses.html index b9b3ee324b..8256b1a83c 100644 --- a/app/views/_container-statuses.html +++ b/app/views/_container-statuses.html @@ -6,9 +6,9 @@ -->
-

+

- + diff --git a/app/views/_pod-template-container.html b/app/views/_pod-template-container.html index a1c7bff620..d2f9379734 100644 --- a/app/views/_pod-template-container.html +++ b/app/views/_pod-template-container.html @@ -8,11 +8,11 @@
{{container.name}}
-
+
-
+
Image: {{container.image | imageStreamName}} @@ -26,11 +26,11 @@
-
+
-
+
Build: {{build | buildConfigForBuild}}, @@ -41,11 +41,11 @@
-
+
-
+
Source: @@ -71,11 +71,11 @@
-
+
-
+
Command: @@ -93,11 +93,11 @@
-
+
-
+
Ports: {{port.containerPort}}/{{port.protocol}} ({{port.name}}) → {{port.hostPort}}, @@ -110,11 +110,11 @@
-
+
-
+
Mount: {{mount.name}}, subpath {{mount.subPath}} → {{mount.mountPath}} @@ -123,11 +123,11 @@
-
+
-
+
CPU: {{container.resources.requests.cpu | usageWithUnits: 'cpu'}} to {{container.resources.limits.cpu | usageWithUnits: 'cpu'}} @@ -141,11 +141,11 @@
-
+
-
+
Memory: {{container.resources.requests.memory | usageWithUnits: 'memory'}} to {{container.resources.limits.memory | usageWithUnits: 'memory'}} @@ -159,21 +159,21 @@
-
+
-
+
Readiness Probe:
-
+
-
+
Liveness Probe:
diff --git a/app/views/_volume-claim-templates.html b/app/views/_volume-claim-templates.html index 3316fd128e..7ffcc191a5 100644 --- a/app/views/_volume-claim-templates.html +++ b/app/views/_volume-claim-templates.html @@ -2,13 +2,13 @@
-
Storage claim: {{template.metadata.name}}
+
Storage claim: {{template.metadata.name}}
-
+
-
+
Access Modes: {{mode | sentenceCase }}, @@ -16,11 +16,11 @@
-
+
-
+
Capacity: {{template.spec.resources.requests.storage}} @@ -29,12 +29,12 @@
-
+
Selector:
diff --git a/app/views/browse/build-config.html b/app/views/browse/build-config.html index 3a671cf36c..921a8e8bcc 100644 --- a/app/views/browse/build-config.html +++ b/app/views/browse/build-config.html @@ -202,10 +202,12 @@

No builds.

-
+
- {{build.status.phase}} - {{build.status.reason | sentenceCase}} + + {{build.status.phase}} + {{build.status.reason | sentenceCase}} +
diff --git a/app/views/browse/deployment-config.html b/app/views/browse/deployment-config.html index de06019562..7217467021 100644 --- a/app/views/browse/deployment-config.html +++ b/app/views/browse/deployment-config.html @@ -151,9 +151,9 @@

-
+
- + {{deployment | deploymentStatus}}, {{deployment.status.replicas}}/{{deployment.spec.replicas}} replicas diff --git a/app/views/browse/pod.html b/app/views/browse/pod.html index 339e624153..c3416d4de0 100644 --- a/app/views/browse/pod.html +++ b/app/views/browse/pod.html @@ -156,10 +156,9 @@

-
+
- diff --git a/app/views/browse/service-instance.html b/app/views/browse/service-instance.html index 8f1233be47..10b5884ca1 100644 --- a/app/views/browse/service-instance.html +++ b/app/views/browse/service-instance.html @@ -75,7 +75,7 @@

Status

Status:
- {{serviceInstance | serviceInstanceStatus | sentenceCase}} + {{serviceInstance | serviceInstanceStatus | sentenceCase}}
Status Reason:
{{serviceInstance | serviceInstanceConditionMessage}}
diff --git a/app/views/builds.html b/app/views/builds.html index a8599b8e4a..346adc9bf8 100644 --- a/app/views/builds.html +++ b/app/views/builds.html @@ -102,11 +102,12 @@

The filter is hiding all builds. -
- +
- {{latestBuild.status.phase}} - {{latestBuild.status.reason | sentenceCase}} + + {{latestBuild.status.phase}} + {{latestBuild.status.reason | sentenceCase}} +
@@ -147,11 +148,12 @@

The filter is hiding all builds. {{latestBuild.metadata.name}} -
- +
- {{latestBuild.status.phase}} - {{latestBuild.status.reason | sentenceCase}} + + {{latestBuild.status.phase}} + {{latestBuild.status.reason | sentenceCase}} +
diff --git a/app/views/catalog/catalog.html b/app/views/catalog/catalog.html index af8ecd66b3..412dc25d4a 100644 --- a/app/views/catalog/catalog.html +++ b/app/views/catalog/catalog.html @@ -22,7 +22,7 @@

No images or templates.

Choose from web frameworks, databases, and other components to add content to your project.

-
+
diff --git a/app/views/catalog/category-content.html b/app/views/catalog/category-content.html index d53047ef22..95de417e87 100644 --- a/app/views/catalog/category-content.html +++ b/app/views/catalog/category-content.html @@ -17,7 +17,7 @@

No images or templates.

- +
diff --git a/app/views/deployments.html b/app/views/deployments.html index 418a17ab62..bc9cac8aa2 100644 --- a/app/views/deployments.html +++ b/app/views/deployments.html @@ -85,9 +85,9 @@

-
+
- + {{replicationController | deploymentStatus}}, {{replicationController.status.replicas}}/{{replicationController.spec.replicas}} replicas diff --git a/app/views/directives/_build-pipeline-expanded.html b/app/views/directives/_build-pipeline-expanded.html index f77addc8af..57102656e1 100644 --- a/app/views/directives/_build-pipeline-expanded.html +++ b/app/views/directives/_build-pipeline-expanded.html @@ -1,4 +1,4 @@ -
+
{{buildConfigName}} @@ -30,7 +30,7 @@
-
+
{{stage.name}}
diff --git a/app/views/directives/deployment-donut.html b/app/views/directives/deployment-donut.html index 6c23181c6c..80ab111a0b 100644 --- a/app/views/directives/deployment-donut.html +++ b/app/views/directives/deployment-donut.html @@ -1,6 +1,6 @@ -
-
-
+
+
+
-
+
Autoscaled: min: {{hpa[0].spec.minReplicas || 1}}, diff --git a/app/views/directives/labels.html b/app/views/directives/labels.html index 8d33e8e5f6..7471248f61 100644 --- a/app/views/directives/labels.html +++ b/app/views/directives/labels.html @@ -1,11 +1,11 @@ -
- - +
+ + {{labelKey}}{{labelValue}}<empty> - + {{labelKey}}{{labelValue}} More labels... -
\ No newline at end of file +
diff --git a/app/views/directives/pods-table.html b/app/views/directives/pods-table.html index 205aa7c058..d7d99887d9 100644 --- a/app/views/directives/pods-table.html +++ b/app/views/directives/pods-table.html @@ -30,9 +30,9 @@ -
+
- {{pod | podStatus | humanizePodStatus}} + {{pod | podStatus | humanizePodStatus}}
{{pod | numContainersReady}}/{{pod.spec.containers.length}} diff --git a/app/views/logs/chromeless-build-log.html b/app/views/logs/chromeless-build-log.html index 214d72db03..cb4c16d134 100644 --- a/app/views/logs/chromeless-build-log.html +++ b/app/views/logs/chromeless-build-log.html @@ -11,8 +11,7 @@ time-start="build.status.startTimestamp | date : 'medium'" time-end="build.status.completionTimestamp | date : 'medium'" chromeless="true" - run="logCanRun" - flex> + run="logCanRun">
diff --git a/app/views/logs/chromeless-deployment-log.html b/app/views/logs/chromeless-deployment-log.html index 3f6b33aa86..dadff3b336 100644 --- a/app/views/logs/chromeless-deployment-log.html +++ b/app/views/logs/chromeless-deployment-log.html @@ -9,8 +9,7 @@ context="projectContext" options="logOptions" chromeless="true" - run="logCanRun" - flex> + run="logCanRun">
diff --git a/app/views/logs/chromeless-pod-log.html b/app/views/logs/chromeless-pod-log.html index 20eed37ed3..567f901c99 100644 --- a/app/views/logs/chromeless-pod-log.html +++ b/app/views/logs/chromeless-pod-log.html @@ -11,8 +11,7 @@ status="pod.status.phase" time-start="pod.status.startTime | date : 'medium'" chromeless="true" - run="logCanRun" - flex> + run="logCanRun">
diff --git a/app/views/membership.html b/app/views/membership.html index 240a61e12b..a56765721e 100644 --- a/app/views/membership.html +++ b/app/views/membership.html @@ -24,11 +24,6 @@

-
-
- -
-

You do not have permission to view roles in this project.

@@ -54,23 +49,18 @@

-
+ class="col-heading"> +

Name

-
-

Roles

-
-
-

- Add Another Role -

+
+
+

Roles

+
@@ -81,9 +71,8 @@

-
+ class="item-row highlight-hover"> +
-
+
+ class="select-role"> @@ -162,8 +150,8 @@

ng-if="newBinding">
-