Apply correct font size to resource name within activity dashboard card

Involves reverting #4237 which created https://bugzilla.redhat.com/show_bug.cgi?id=1802040 fixes https://bugzilla.redhat.com/show_bug.cgi?id=1802040
openshift · Feb 17, 2020 · 4a6f35d · 4a6f35d
1 parent 234ec55
commit 4a6f35d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/frontend/packages/console-shared/src/components/dashboard/activity-card/activity-card.scss b/frontend/packages/console-shared/src/components/dashboard/activity-card/activity-card.scss
@@ -1,5 +1,6 @@
 @import '~@patternfly/patternfly/sass-utilities/colors';
 @import '../../../styles/skeleton-screen';
+@import '../../../../../../public/style/vars';
 
 .co-activity-card__body {
   max-height: 30rem;
@@ -106,6 +107,7 @@
   white-space: nowrap;
 
   .co-resource-item__resource-name {
+    font-size: $font-size-base;
     text-overflow: ellipsis;
     overflow: hidden;
   }

diff --git a/frontend/public/components/_resource.scss b/frontend/public/components/_resource.scss
@@ -142,11 +142,7 @@
     white-space: nowrap;
   }
   &__resource-name {
-    font-size: $font-size-base;
     min-width: 0; // required so co-break-word works
-    &--lg {
-      font-size: var(--pf-global--FontSize--xl);
-    }
   }
   &__resource-status {
     padding-left: 8px;

diff --git a/frontend/public/components/overview/_overview.scss b/frontend/public/components/overview/_overview.scss
@@ -60,6 +60,7 @@ $overview-sidebar-width: 550px;
   padding-top: 5px;
 
   .co-m-pane__heading {
+    font-size: var(--pf-global--FontSize--xl);
     margin: 0 20px var(--pf-global--spacer--md);
   }
 

diff --git a/frontend/public/components/utils/headings.tsx b/frontend/public/components/utils/headings.tsx
@@ -129,10 +129,7 @@ export const PageHeading = connectToModel((props: PageHeadingProps) => {
           ) : (
             <div className="co-m-pane__name co-resource-item">
               {kind && <ResourceIcon kind={kind} className="co-m-resource-icon--lg" />}{' '}
-              <span
-                data-test-id="resource-title"
-                className="co-resource-item__resource-name co-resource-item__resource-name--lg"
-              >
+              <span data-test-id="resource-title" className="co-resource-item__resource-name">
                 {resourceTitle}
               </span>
               {resourceStatus && (
@@ -207,7 +204,7 @@ export const ResourceOverviewHeading: React.SFC<ResourceOverviewHeadingProps> =
               resource.metadata.name,
               resource.metadata.namespace,
             )}
-            className="co-resource-item__resource-name co-resource-item__resource-name--lg"
+            className="co-resource-item__resource-name"
           >
             {resource.metadata.name}
           </Link>