fix(admin-ui): change links theme

GluuFederation · Aug 29, 2022 · 04b416d · 04b416d
1 parent 9abc384
commit 04b416d
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 58 deletions.
diff --git a/admin-ui/app/styles/custom/layout.scss b/admin-ui/app/styles/custom/layout.scss
@@ -5,7 +5,7 @@
 }
 
 .txt-white {
-  color: #FFFFFF;
+  color: #ffffff;
 }
 
 .badge {
@@ -14,109 +14,111 @@
 
 .badge-primary-darkBlack {
   background-color: #303641;
-  color: #FFFFFF;
+  color: #ffffff;
 }
 
 .badge-primary-darkBlue {
   background-color: #284461;
-  color: #FFFFFF;
+  color: #ffffff;
 }
 
 .badge-primary-lightBlue {
-  background-color: #9DBDE2;
-  color: #FFFFFF;
+  background-color: #9dbde2;
+  color: #ffffff;
 }
 
 .badge-primary-lightGreen {
-  background-color: #3BC391;
-  color: #FFFFFF;
+  background-color: #3bc391;
+  color: #ffffff;
 }
 
 // Button
 
 .btn-primary-darkBlack {
-  background-color: #303641!important;
-  color: #FFFFFF!important;
+  background-color: #303641 !important;
+  color: #ffffff !important;
 }
 
 .btn-primary-darkBlue {
-  background-color: #284461!important;
-  color: #FFFFFF!important;
+  background-color: #284461 !important;
+  color: #ffffff !important;
 }
 
 .btn-primary-lightBlue {
-  background-color: #9DBDE2!important;
-  color: #FFFFFF!important;
+  background-color: #9dbde2 !important;
+  color: #ffffff !important;
 }
 
 .btn-primary-lightGreen {
-  background-color: #3BC391!important;
-  color: #FFFFFF!important;
+  background-color: #3bc391 !important;
+  color: #ffffff !important;
 }
 
 // Button outline
 
 .btn-outline-primary-darkBlack {
-  background-color: #303641!important;
-  color: #FFFFFF!important;
+  background-color: #303641 !important;
+  color: #ffffff !important;
 }
 
 .btn-outline-primary-darkBlue {
-  background-color: #284461!important;
-  color: #FFFFFF!important;
+  background-color: #284461 !important;
+  color: #ffffff !important;
 }
 
 .btn-outline-primary-lightBlue {
-  background-color: #9DBDE2!important;
-  color: #FFFFFF!important;
+  background-color: #9dbde2 !important;
+  color: #ffffff !important;
 }
 
 .btn-outline-primary-lightGreen {
-  background-color: #3BC391!important;
-  color: #FFFFFF!important;
+  background-color: #3bc391 !important;
+  color: #ffffff !important;
 }
 
 // Tooltip
 
 .type-darkBlack {
-  background-color: #303641!important;
-  color: #FFFFFF!important;
+  background-color: #303641 !important;
+  color: #ffffff !important;
   &::after {
-    border-bottom-color: #303641!important;
+    border-bottom-color: #303641 !important;
   }
 }
 
 .type-darkBlue {
-  background-color: #284461!important;
-  color: #FFFFFF!important;
+  background-color: #284461 !important;
+  color: #ffffff !important;
   &::after {
-    border-bottom-color: #284461!important;
+    border-bottom-color: #284461 !important;
   }
 }
 
 .type-lightBlue {
-  background-color: #9DBDE2!important;
-  color: #FFFFFF!important;
+  background-color: #9dbde2 !important;
+  color: #ffffff !important;
   &::after {
-    border-bottom-color: #9DBDE2!important;
+    border-bottom-color: #9dbde2 !important;
   }
 }
 
 .type-lightGreen {
-  background-color: #3BC391!important;
-  color: #FFFFFF!important;
+  background-color: #3bc391 !important;
+  color: #ffffff !important;
   &::after {
-    border-bottom-color: #3BC391!important;
+    border-bottom-color: #3bc391 !important;
   }
 }
 
 .badge-dimmed {
   background-color: #777;
-  color: #FFFFFF;
+  color: #ffffff;
 }
 
 .common-link {
-  color: #2767b3
+  color: #2767b3;
+  text-decoration: 'none';
+  cursor: pointer;
 }
 
 .top-5 {
@@ -125,5 +127,5 @@
 }
 
 .modal-lg-900 {
-  max-width: 900px!important;
-}
+  max-width: 900px !important;
+}
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientAdvancedPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientAdvancedPanel.js
@@ -128,10 +128,7 @@ function ClientAdvancedPanel({ client, scripts, formik, viewOnly }) {
           <FormGroup row>
             <GluuLabel label="fields.spontaneousScopes" />
             <Col sm={9}>
-              <a
-                onClick={handler}
-                style={{ textDecoration: 'underline', cursor: 'pointer' }}
-              >
+              <a onClick={handler} className="common-link">
                 View Current
               </a>
             </Col>

diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientListPage.js b/admin-ui/plugins/auth-server/components/Clients/ClientListPage.js
@@ -74,7 +74,7 @@ function ClientListPage({ clients, permissions, scopes, loading, dispatch }) {
 
   function addOrg(client) {
     let org = '-'
-    if(client.hasOwnProperty("o")){
+    if (client.hasOwnProperty('o')) {
       client['organization'] = client.o
       return client
     }
@@ -139,13 +139,13 @@ function ClientListPage({ clients, permissions, scopes, loading, dispatch }) {
       field: 'scopes',
       render: (rowData) => {
         return (
-          <Badge
-            color={`primary-${selectedTheme}`}
-            role={'button'}
+          <a
+            className="common-link"
+            href="javascript:;"
             onClick={() => setScopeData(rowData.scopes)}
           >
             {rowData.scopes?.length || '0'}
-          </Badge>
+          </a>
         )
       },
     },

diff --git a/admin-ui/plugins/auth-server/components/Scopes/ScopeForm.js b/admin-ui/plugins/auth-server/components/Scopes/ScopeForm.js
@@ -378,10 +378,7 @@ function ScopeForm({ scope, scripts, attributes, handleSubmit }) {
                               onClick={() =>
                                 goToClientViewPage(item.inum, item)
                               }
-                              style={{
-                                textDecoration: 'underline',
-                                cursor: 'pointer',
-                              }}
+                              className="common-link"
                             >
                               {item.displayName ? item.displayName : item.inum}
                             </a>
@@ -443,10 +440,7 @@ function ScopeForm({ scope, scripts, attributes, handleSubmit }) {
                               onClick={() =>
                                 goToClientViewPage(item.inum, item)
                               }
-                              style={{
-                                textDecoration: 'underline',
-                                cursor: 'pointer',
-                              }}
+                              className="common-link"
                             >
                               {item.displayName ? item.displayName : item.inum}
                             </a>

diff --git a/admin-ui/plugins/auth-server/components/Scopes/ScopeListPage.js b/admin-ui/plugins/auth-server/components/Scopes/ScopeListPage.js
@@ -74,7 +74,10 @@ function ScopeListPage({ scopes, permissions, loading, dispatch }) {
           return 0
         }
         return (
-          <Link to={`/auth-server/clients?scopeInum=${rowData.inum}`} className={classes.link}>
+          <Link
+            to={`/auth-server/clients?scopeInum=${rowData.inum}`}
+            className="common-link"
+          >
             {rowData.clients?.length}
           </Link>
         )
@@ -226,7 +229,10 @@ function ScopeListPage({ scopes, permissions, loading, dispatch }) {
               searchFieldAlignment: 'left',
               selection: false,
               pageSize: pageSize,
-              headerStyle: { ...applicationStyle.tableHeaderStyle, ...bgThemeColor },
+              headerStyle: {
+                ...applicationStyle.tableHeaderStyle,
+                ...bgThemeColor,
+              },
               actionsColumnIndex: -1,
             }}
             detailPanel={(rowData) => {