Merge pull request #9515 from sg00dwin/convert-bootstrap-utilities-show

CONSOLE-2361: Convert Bootstrap utility class show to PF equivalent
openshift · Jul 23, 2021 · 1596116 · 1596116
2 parents 28b7545 + e991f85
commit 1596116
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/frontend/packages/ceph-storage-plugin/src/utils/osd-size-dropdown.tsx b/frontend/packages/ceph-storage-plugin/src/utils/osd-size-dropdown.tsx
@@ -30,7 +30,7 @@ const DropdownOptionsItem: React.FC<DropdownOptionsItemProps> = ({ title, scale
       {title}
       <>
         &nbsp;
-        <div className="co-resource-item__resource-api text-muted co-truncate show co-nowrap small">
+        <div className="co-resource-item__resource-api text-muted co-truncate pf-u-display-block co-nowrap small">
           {scale}
         </div>
       </>

diff --git a/frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx b/frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx
@@ -32,9 +32,9 @@ const DropdownItem: React.FC<DropdownItemProps> = ({ model, name, namespace }) =
     <span className="co-resource-item__resource-name">
       <span>{name}</span>
       {namespace && (
-        <span className="text-muted co-truncate show co-nowrap small co-resource-item__resource-namespace">
+        <div className="text-muted co-truncate co-nowrap small co-resource-item__resource-namespace">
           {namespace}
-        </span>
+        </div>
       )}
     </span>
   </span>

diff --git a/frontend/public/components/resource-dropdown.tsx b/frontend/public/components/resource-dropdown.tsx
@@ -90,9 +90,9 @@ const ResourceListDropdown_: React.SFC<ResourceListDropdownProps> = (props) => {
               )}
             </span>
             {isDup(model.kind) && (
-              <span className="co-resource-item__resource-api text-muted co-truncate show co-nowrap small">
+              <div className="co-resource-item__resource-api text-muted co-truncate co-nowrap small">
                 {model.apiGroup || 'core'}/{model.apiVersion}
-              </span>
+              </div>
             )}
           </span>
         </span>

diff --git a/frontend/public/components/search.tsx b/frontend/public/components/search.tsx
@@ -199,9 +199,9 @@ const SearchPage_: React.FC<SearchProps> = (props) => {
     return (
       <span className="co-search-group__accordion-label">
         {labelPluralKey ? t(labelPluralKey) : labelPlural}{' '}
-        <span className="text-muted show small">
+        <div className="text-muted small">
           {apiGroup || 'core'}/{apiVersion}
-        </span>
+        </div>
       </span>
     );
   };

diff --git a/frontend/public/vendor.scss b/frontend/public/vendor.scss
@@ -39,6 +39,7 @@
 @import "~@patternfly/patternfly/components/NotificationDrawer/notification-drawer";
 @import "~@patternfly/patternfly/components/Toolbar/toolbar";
 @import "~@patternfly/patternfly/utilities/Alignment/alignment";
+@import "~@patternfly/patternfly/utilities/Display/display";
 @import "~@patternfly/patternfly/utilities/Sizing/sizing";
 @import "~@patternfly/patternfly/patternfly-charts";