From a554711b760d599d70f90e9b0c1a3e2ba31bbe80 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 7 Jul 2021 11:49:15 -0700
Subject: [PATCH] Fixed styles

---
 View/Elements/Components/optAction.ctp |  8 ++++----
 View/GrouperGroups/groupmember.ctp     | 10 +++++-----
 View/GrouperGroups/groupoptin.ctp      |  8 ++++----
 View/GrouperGroups/groupowner.ctp      |  8 ++++----
 webroot/css/co-grouper-base.css        |  7 +------
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp
index cf6504a..e9a818f 100644
--- a/View/Elements/Components/optAction.ctp
+++ b/View/Elements/Components/optAction.ctp
@@ -3,9 +3,9 @@
   'class' => 'd-flex justify-content-center',
   'id' => 'join-group.' . $idx
 )); ?>
-<?php print $this->Form->hidden('GroupName', array('default' => $group, 'id' => 'groupName.'.$idx)); ?>
-<button class="btn btn-block btn-<?php echo $member ? 'danger' : 'success'; ?>" type="submit">
-    <?php echo $member ? _txt('pl.grouperlite.action.leave') : _txt('pl.grouperlite.action.join') ?> &nbsp;
-    <i class="fa fa-<?php echo $member ? 'user-times' : 'users'; ?> fa-sm"></i>
+<?php print $this->Form->hidden('GroupName', array('default' => $group, 'id' => 'groupName.' . $idx)); ?>
+<button class="btn btn-block btn-sm btn-<?php echo $member ? 'danger' : 'success'; ?>" type="submit">
+  <?php echo $member ? _txt('pl.grouperlite.action.leave') : _txt('pl.grouperlite.action.join') ?> &nbsp;
+  <i class="fa fa-<?php echo $member ? 'user-times' : 'users'; ?> fa-sm"></i>
 </button>
 <?php echo $this->Form->end(); ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 62bb7e9..7b5c825 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -31,12 +31,12 @@ $numColumns = count($columns);
             <tbody>
                 <tr>
                     <td colspan="<?php echo $numColumns; ?>">
-                        <p class="lead">Ad-hoc groups</p>
+                        <p class="h6 fw-bold m-0">Ad-hoc groups</p>
                     </td>
                 </tr>
                 <?php foreach ($groupmemberships as $key => $group) : ?>
                     <tr>
-                        <td class="pl-2"><a href="<?php echo $this->Html->url(
+                        <td class="pl-3"><a href="<?php echo $this->Html->url(
                                                         array(
                                                             'controller' => 'grouper_groups',
                                                             'action' => 'groupinfo',
@@ -60,12 +60,12 @@ $numColumns = count($columns);
                 <?php foreach ($wgmemberships as $wggroup) : ?>
                     <tr>
                         <td colspan="<?php echo $numColumns; ?>">
-                            <p class="lead fw-bold"><?php echo $wggroup['WGName'] ?? "No Name"; ?></p>
+                            <p class="h6 fw-bold m-0"><?php echo $wggroup['WGName'] ?? "No Name"; ?></p>
                         </td>
                     </tr>
                     <?php foreach ($wggroup['Groups'] as $key => $group) : ?>
-                        <tr class="pl-2">
-                            <td class="pl-2"><a href="<?php echo $this->Html->url(
+                        <tr>
+                            <td class="pl-3"><a href="<?php echo $this->Html->url(
                                                             array(
                                                                 'controller' => 'grouper_groups',
                                                                 'action' => 'groupinfo',
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
index 0de3dfc..55ff062 100644
--- a/View/GrouperGroups/groupoptin.ctp
+++ b/View/GrouperGroups/groupoptin.ctp
@@ -31,12 +31,12 @@ $numColumns = count($columns);
       <tbody>
         <tr>
           <td colspan="<?php echo $numColumns; ?>">
-            <p class="lead fw-bold">Ad-hoc groups</p>
+            <p class="h6 fw-bold m-0">Ad-hoc groups</p>
           </td>
         </tr>
         <?php foreach ($groupoptins as $key => $group) : ?>
           <tr>
-            <td class="pl-2"><a href="<?php echo $this->Html->url(
+            <td class="pl-3"><a href="<?php echo $this->Html->url(
                                         array(
                                           'controller' => 'grouper_groups',
                                           'action' => 'groupinfo',
@@ -61,12 +61,12 @@ $numColumns = count($columns);
         <?php foreach ($wgoptins as $wgoptin) : ?>
           <tr>
             <td colspan="<?php echo $numColumns; ?>">
-              <p class="lead fw-bold"><?php echo $wgoptin['WGName'] ?? "No Name"; ?></p>
+              <p class="h6 fw-bold m-0"><?php echo $wgoptin['WGName'] ?? "No Name"; ?></p>
             </td>
           </tr>
           <?php foreach ($wgoptin['Groups'] as $key => $group) : ?>
             <tr>
-              <td class="pl-2"><a href="<?php echo $this->Html->url(
+              <td class="pl-3"><a href="<?php echo $this->Html->url(
                                           array(
                                             'controller' => 'grouper_groups',
                                             'action' => 'groupinfo',
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 60a1f41..7f0d959 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -32,12 +32,12 @@ $numColumns = count($columns);
       <tbody>
         <tr>
           <td colspan="<?php echo $numColumns; ?>">
-            <p class="lead fw-bold">Ad-hoc groups</>
+            <p class="h6 fw-bold m-0">Ad-hoc groups</>
           </td>
         </tr>
         <?php foreach ($groupsowners as $group) : ?>
           <tr>
-            <td class="pl-2"><a href="<?php echo $this->Html->url(
+            <td class="pl-3"><a href="<?php echo $this->Html->url(
                                         array(
                                           'controller' => 'grouper_groups',
                                           'action' => 'groupinfo',
@@ -67,12 +67,12 @@ $numColumns = count($columns);
         <?php foreach ($wgowners as $wgowner) : ?>
           <tr>
             <td colspan="<?php echo $numColumns; ?>">
-              <p class="lead fw-bold"><?php echo $wgowner['WGName'] ?? "No Name"; ?></p>
+              <p class="h6 fw-bold m-0"><?php echo $wgowner['WGName'] ?? "No Name"; ?></p>
             </td>
           </tr>
           <?php foreach ($wgowner['Groups'] as $key => $group) : ?>
             <tr>
-              <td class="pl-2"><a href="<?php echo $this->Html->url(
+              <td class="pl-3"><a href="<?php echo $this->Html->url(
                                           array(
                                             'controller' => 'grouper_groups',
                                             'action' => 'groupinfo',
diff --git a/webroot/css/co-grouper-base.css b/webroot/css/co-grouper-base.css
index bdd0d9c..1052908 100644
--- a/webroot/css/co-grouper-base.css
+++ b/webroot/css/co-grouper-base.css
@@ -1,5 +1,5 @@
 :root {
-    --red: #CC3333;
+    --red: #912929;
     --blue: #1D7AB4;
     --green: #22AA22;
     --teal: #1c6070;
@@ -24,10 +24,5 @@
     background-color: var(--danger);
     border-color: var(--danger);
     color: white;
-    filter: grayscale(20%);
     box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
-}
-
-.grouper .btn.btn-danger.btn-grouper:hover {
-    filter: none;
 }
\ No newline at end of file