Merge pull request #1827 from sg00dwin/pf-list-overview-issues

OpenShift Bot · web-flow · commit 3355713b6791 · 2017-07-21T12:44:49.000-04:00
Merged by openshift-bot
diff --git a/app/styles/_overview.less b/app/styles/_overview.less
@@ -23,7 +23,11 @@
   }
 }
 .builds-label {
+  display: inline-block;
   margin-right: 5px;
+  @media (max-width: @screen-sm-max) {
+    margin-top: 5px;
+  }
 }
 .mini-donut-link {
   color: @gray-darker;
@@ -61,7 +65,10 @@
 }
 .notification-icon-count {
   display: inline-block;
-  margin: 0 5px 0 0;
+  margin: 5px 5px 0 0;
+  @media (min-width: @screen-md-min) {
+    margin-top: 0;
+  }
   [data-toggle="tooltip"] {
     cursor: help;
   }
@@ -234,6 +241,12 @@
     @media (min-width: @screen-sm-min) {
       justify-content: flex-end;
     }
+    @media(max-width: @screen-xs-max) {
+      &.deployment-in-progress-msg {
+        margin-top: 5px;
+        width: 100%;
+      }
+    }
   }
   .list-pf-expansion.in {
     .deployment-donut > div[row] {
@@ -434,11 +447,9 @@
       }
     }
   }
-  .status-icons {
-    margin-top: 5px;
-    @media (min-width: @screen-md-min) {
+  @media (min-width: @screen-md-min) {
+    .status-icons {
       margin-right: 15px;
-      margin-top: 0;
       width: 40%;
     }
   }
diff --git a/app/views/overview/_list-row-content.html b/app/views/overview/_list-row-content.html
@@ -35,7 +35,7 @@ <h3>
     No deployments for <a ng-href="{{row.apiObject | navigateResourceURL}}">{{row.apiObject.metadata.name}}</a>
   </span>
 </div>
-<div ng-if="row.isDeploymentInProgress()" class="list-pf-details">
+<div ng-if="row.isDeploymentInProgress()" class="list-pf-details deployment-in-progress-msg">
   <div ng-if="row.apiObject.kind === 'DeploymentConfig'">
     <span class="mar-right-sm">
       <span class="hidden-xs">
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -11834,7 +11834,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "No deployments for <a ng-href=\"{{row.apiObject | navigateResourceURL}}\">{{row.apiObject.metadata.name}}</a>\n" +
     "</span>\n" +
     "</div>\n" +
-    "<div ng-if=\"row.isDeploymentInProgress()\" class=\"list-pf-details\">\n" +
+    "<div ng-if=\"row.isDeploymentInProgress()\" class=\"list-pf-details deployment-in-progress-msg\">\n" +
     "<div ng-if=\"row.apiObject.kind === 'DeploymentConfig'\">\n" +
     "<span class=\"mar-right-sm\">\n" +
     "<span class=\"hidden-xs\">\n" +
diff --git a/dist/styles/main.css b/dist/styles/main.css

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,11 @@`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`.builds-label {`
	`26`	`+ display: inline-block;`
`26`	`27`	`margin-right: 5px;`
	`28`	`+ @media (max-width: @screen-sm-max) {`
	`29`	`+ margin-top: 5px;`
	`30`	`+ }`
`27`	`31`	`}`
`28`	`32`	`.mini-donut-link {`
`29`	`33`	`color: @gray-darker;`
`@@ -61,7 +65,10 @@`
`61`	`65`	`}`
`62`	`66`	`.notification-icon-count {`
`63`	`67`	`display: inline-block;`
`64`		`- margin: 0 5px 0 0;`
	`68`	`+ margin: 5px 5px 0 0;`
	`69`	`+ @media (min-width: @screen-md-min) {`
	`70`	`+ margin-top: 0;`
	`71`	`+ }`
`65`	`72`	`[data-toggle="tooltip"] {`
`66`	`73`	`cursor: help;`
`67`	`74`	`}`
`@@ -234,6 +241,12 @@`
`234`	`241`	`@media (min-width: @screen-sm-min) {`
`235`	`242`	`justify-content: flex-end;`
`236`	`243`	`}`
	`244`	`+ @media(max-width: @screen-xs-max) {`
	`245`	`+ &.deployment-in-progress-msg {`
	`246`	`+ margin-top: 5px;`
	`247`	`+ width: 100%;`
	`248`	`+ }`
	`249`	`+ }`
`237`	`250`	`}`
`238`	`251`	`.list-pf-expansion.in {`
`239`	`252`	`.deployment-donut > div[row] {`
`@@ -434,11 +447,9 @@`
`434`	`447`	`}`
`435`	`448`	`}`
`436`	`449`	`}`
`437`		`- .status-icons {`
`438`		`- margin-top: 5px;`
`439`		`- @media (min-width: @screen-md-min) {`
	`450`	`+ @media (min-width: @screen-md-min) {`
	`451`	`+ .status-icons {`
`440`	`452`	`margin-right: 15px;`
`441`		`- margin-top: 0;`
`442`	`453`	`width: 40%;`
`443`	`454`	`}`
`444`	`455`	`}`