Merge pull request #1 from spadgett/dave-route-conditions

Route conditions: style cleanup
openshift · Jun 22, 2018 · 6e5fe90 · 6e5fe90
2 parents 5d469e2 + dd1acbd
commit 6e5fe90
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 31 deletions.
diff --git a/frontend/public/components/_route.scss b/frontend/public/components/_route.scss
@@ -11,26 +11,3 @@
 .co-m-route-tls-reveal__btn {
   padding-right: 0;
 }
-
-.co-m-route__ingress-status-section {
-  .co-m-route__ingress-status {
-    padding-bottom: 40px;
-
-    .co-m-table-grid {
-      .co-m-table-grid__head,
-      .co-m-table-grid__body {
-        div {
-          padding-left: 0;
-        }
-      }
-    }
-  }
-
-  .co-m-route-ingress-status:last-child {
-    padding-bottom: 0px;
-  }
-}
-
-.co-m-route__ingress-status__conditions-heading {
-  margin-top: 20px;
-}
diff --git a/frontend/public/components/routes.tsx b/frontend/public/components/routes.tsx
@@ -233,7 +233,7 @@ const RouteIngressStatus: React.SFC<RouteIngressStatusProps> = ({ingresses}) =>
           <dt>Wildcard Policy</dt>
           <dd>{ingress.wildcardPolicy}</dd>
         </dl>
-        <h4 className="co-m-route__ingress-status__conditions-heading">Conditions</h4>
+        <h2 className="co-section-title-secondary">Conditions</h2>
         <Conditions conditions={ingress.conditions} />
       </div>)}
   </span>;
@@ -265,13 +265,6 @@ const RouteDetails: React.SFC<RoutesDetailsProps> = ({obj: route}) => <React.Fra
       </div>
     </div>
   </div>
-  {_.isEmpty(route.status.ingress)
-    ? <div className="cos-status-box">
-      <div className="text-center">No Route Status</div>
-    </div>
-    : <div className="co-m-pane__body">
-      <RouteIngressStatus ingresses={route.status.ingress} />
-    </div>}
   <div className="co-m-pane__body">
     <h1 className="co-section-title">TLS Settings</h1>
     <TLSSettings tls={route.spec.tls} />
@@ -297,6 +290,13 @@ const RouteDetails: React.SFC<RoutesDetailsProps> = ({obj: route}) => <React.Fra
       </table>
     </div>
   </div> }
+  {_.isEmpty(route.status.ingress)
+    ? <div className="cos-status-box">
+      <div className="text-center">No Route Status</div>
+    </div>
+    : <div className="co-m-pane__body">
+      <RouteIngressStatus ingresses={route.status.ingress} />
+    </div>}
 </React.Fragment>;
 
 export const RoutesDetailsPage: React.SFC<RoutesDetailsPageProps> = props => <DetailsPage

diff --git a/frontend/public/style/_common.scss b/frontend/public/style/_common.scss
@@ -103,6 +103,12 @@
   margin: 0 0 30px 0;
 }
 
+.co-section-title-secondary {
+  font-size: 16px;
+  font-weight: 600;
+  margin: 30px 0;
+}
+
 .co-table-container {
   overflow: auto;
   margin-bottom: 30px;