Merge pull request #162 from edx/dsheraz/PROD-2535

fix: style updates
openedx · Oct 7, 2021 · 6a14dea · 6a14dea
2 parents d05c1fd + 71322cf
commit 6a14dea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/overrides.scss b/src/overrides.scss
@@ -17,7 +17,7 @@ $darkCyan: #00262b;
 }
 
 .custom-table {
-  font-size: small;
+  font-size: smaller;
   width: 100%;
   th {
     margin: 0;
@@ -32,8 +32,8 @@ $darkCyan: #00262b;
 }
 
 .sso-table {
-  font-size: small;
   width: auto;
+  font-size: smaller;
   th {
     margin: 0;
     padding: 0.5rem;
@@ -48,7 +48,6 @@ $darkCyan: #00262b;
 
 .idv-table {
   @extend .custom-table;
-  font-size: medium;
 
   tr:last-child td {
     border-bottom: none;
@@ -60,7 +59,7 @@ $darkCyan: #00262b;
 }
 
 .account-info {
-  font-size: large;
+  font-size: smaller;
   width: auto;
   border: none;
   border-radius: 0;
@@ -84,13 +83,11 @@ $darkCyan: #00262b;
 
 .account-actions {
   border: 1px solid lightgray;
-  font-size: medium;
   border-radius: 0.375rem;
 }
 
 .fbe-table {
   @extend .sso-table;
-  font-size: medium;
 
   tr:last-child th,
   tr:last-child td {
@@ -101,15 +98,14 @@ $darkCyan: #00262b;
 .certificate-info-table {
   @extend .sso-table;
   width: 100%;
-  font-size: large;
 }
 
 .course-summary-table {
   @extend .certificate-info-table;
 }
 
 .course-runs-table {
-  font-size: small;
+  font-size: smaller;
   width: 100%;
   th {
     margin: 0;
@@ -124,7 +120,7 @@ $darkCyan: #00262b;
 }
 
 .custom-expander-table {
-  font-size: small;
+  font-size: smaller;
   margin-left: 10%;
   th {
     margin: 0;

diff --git a/src/users/account-actions/v2/PasswordHistory.jsx b/src/users/account-actions/v2/PasswordHistory.jsx
@@ -45,8 +45,9 @@ export default function PasswordHistory({
       {passwordStatus.passwordToggleHistory.length > 0 && (
       <Button
         id="toggle-password-history"
-        variant="outline-primary ml-1"
+        variant="outline-primary"
         onClick={() => openHistoryModal()}
+        className="mr-1 mb-2"
       >
         Show History
       </Button>

diff --git a/src/users/account-actions/v2/ResetPassword.jsx b/src/users/account-actions/v2/ResetPassword.jsx
@@ -18,8 +18,9 @@ export default function ResetPassword({
     <div>
       <Button
         id="reset-password"
-        variant="btn btn-danger ml-1"
+        variant="btn btn-danger"
         onClick={() => setResetPasswordModalIsOpen(true)}
+        className="mr-1 mb-2"
       >Reset Password
       </Button>
 

diff --git a/src/users/account-actions/v2/TogglePasswordStatus.jsx b/src/users/account-actions/v2/TogglePasswordStatus.jsx
@@ -29,6 +29,7 @@ export default function TogglePasswordStatus({
         id="toggle-password"
         variant={`${passwordStatus.status === PASSWORD_STATUS.USABLE ? 'danger' : 'primary'}`}
         onClick={() => setDisableUserModalIsOpen(true)}
+        className="mr-1 mb-2"
       >
         {passwordStatus.status === PASSWORD_STATUS.USABLE ? DISABLE_USER : ENABLE_USER}
       </Button>