ryoji-s před 2 roky
rodič
revize
fa5c1b6006
21 změnil soubory, kde provedl 22 přidání a 22 odebrání
  1. 1 1
      apps/app/src/components/Admin/ElasticsearchManagement/StatusTable.jsx
  2. 1 1
      apps/app/src/components/Admin/ImportData/GrowiArchive/ImportCollectionItem.jsx
  3. 1 1
      apps/app/src/components/Admin/Notification/GlobalNotificationList.jsx
  4. 1 1
      apps/app/src/components/Admin/Notification/ManageGlobalNotification.tsx
  5. 1 1
      apps/app/src/components/Admin/Security/GitHubSecuritySettingContents.jsx
  6. 1 1
      apps/app/src/components/Admin/Security/GoogleSecuritySettingContents.jsx
  7. 1 1
      apps/app/src/components/Admin/Security/LdapSecuritySettingContents.jsx
  8. 1 1
      apps/app/src/components/Admin/Security/LocalSecuritySettingContents.jsx
  9. 1 1
      apps/app/src/components/Admin/Security/OidcSecuritySettingContents.jsx
  10. 1 1
      apps/app/src/components/Admin/Security/SamlSecuritySettingContents.jsx
  11. 1 1
      apps/app/src/components/Admin/Security/ShareLinkSetting.tsx
  12. 1 1
      apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx
  13. 1 1
      apps/app/src/components/Admin/Users/ExternalAccountTable.tsx
  14. 2 2
      apps/app/src/components/Admin/Users/UserTable.tsx
  15. 1 1
      apps/app/src/components/Common/CountBadge.tsx
  16. 1 1
      apps/app/src/components/PageEditorByHackmd.tsx
  17. 1 1
      apps/app/src/components/PageStatusAlert.tsx
  18. 1 1
      apps/app/src/components/TagList.tsx
  19. 1 1
      apps/app/src/features/growi-plugin/client/components/Admin/PluginsExtensionPageContents/PluginCard.tsx
  20. 1 1
      apps/app/src/features/questionnaire/client/components/QuestionnaireToast.tsx
  21. 1 1
      packages/editor/src/components/playground/Playground.tsx

+ 1 - 1
apps/app/src/components/Admin/ElasticsearchManagement/StatusTable.jsx

@@ -47,7 +47,7 @@ class StatusTable extends React.PureComponent {
 
 
     return isNormalized
     return isNormalized
       ? <span className="badge rounded-pill bg-info">{ t('full_text_search_management.indices_status_label_normalized') }</span>
       ? <span className="badge rounded-pill bg-info">{ t('full_text_search_management.indices_status_label_normalized') }</span>
-      : <span className="badge rounded-pill bg-warning">{ t('full_text_search_management.indices_status_label_unnormalized') }</span>;
+      : <span className="badge rounded-pill bg-warning text-dark">{ t('full_text_search_management.indices_status_label_unnormalized') }</span>;
   }
   }
 
 
   renderIndexInfoPanel(indexName, body = {}, aliases = []) {
   renderIndexInfoPanel(indexName, body = {}, aliases = []) {

+ 1 - 1
apps/app/src/components/Admin/ImportData/GrowiArchive/ImportCollectionItem.jsx

@@ -200,7 +200,7 @@ export default class ImportCollectionItem extends React.Component {
 
 
     return (
     return (
       <div className="card border-light">
       <div className="card border-light">
-        <div className="card-header bg-light">
+        <div className="card-header bg-light text-dark">
           <div className="d-flex justify-content-between align-items-center flex-wrap">
           <div className="d-flex justify-content-between align-items-center flex-wrap">
             {/* left */}
             {/* left */}
             {this.renderCheckbox()}
             {this.renderCheckbox()}

+ 1 - 1
apps/app/src/components/Admin/Notification/GlobalNotificationList.jsx

@@ -102,7 +102,7 @@ class GlobalNotificationList extends React.Component {
                     </li>
                     </li>
                   )}
                   )}
                   {notification.triggerEvents.includes('pageEdit') && (
                   {notification.triggerEvents.includes('pageEdit') && (
-                    <li className="list-inline-item badge rounded-pill bg-warning">
+                    <li className="list-inline-item badge rounded-pill bg-warning text-dark">
                       <i className="icon-pencil"></i> EDIT
                       <i className="icon-pencil"></i> EDIT
                     </li>
                     </li>
                   )}
                   )}

+ 1 - 1
apps/app/src/components/Admin/Notification/ManageGlobalNotification.tsx

@@ -249,7 +249,7 @@ const ManageGlobalNotification = (props: Props): JSX.Element => {
                 checked={triggerEvents.has(TriggerEventType.EDIT)}
                 checked={triggerEvents.has(TriggerEventType.EDIT)}
                 onChange={() => onChangeTriggerEvents(TriggerEventType.EDIT)}
                 onChange={() => onChangeTriggerEvents(TriggerEventType.EDIT)}
               >
               >
-                <span className="badge rounded-pill bg-warning">
+                <span className="badge rounded-pill bg-warning text-dark">
                   <i className="icon-pencil mr-1" />EDIT
                   <i className="icon-pencil mr-1" />EDIT
                 </span>
                 </span>
               </TriggerEventCheckBox>
               </TriggerEventCheckBox>

+ 1 - 1
apps/app/src/components/Admin/Security/GitHubSecuritySettingContents.jsx

@@ -71,7 +71,7 @@ class GitHubSecurityManagementContents extends React.Component {
               </label>
               </label>
             </div>
             </div>
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('github') && isGitHubEnabled)
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('github') && isGitHubEnabled)
-              && <div className="badge bg-warning">{t('security_settings.setup_is_not_yet_complete')}</div>}
+              && <div className="badge bg-warning text-dark">{t('security_settings.setup_is_not_yet_complete')}</div>}
           </div>
           </div>
         </div>
         </div>
 
 

+ 1 - 1
apps/app/src/components/Admin/Security/GoogleSecuritySettingContents.jsx

@@ -69,7 +69,7 @@ class GoogleSecurityManagementContents extends React.Component {
               </label>
               </label>
             </div>
             </div>
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('google') && isGoogleEnabled)
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('google') && isGoogleEnabled)
-              && <div className="badge bg-warning">{t('security_settings.setup_is_not_yet_complete')}</div>}
+              && <div className="badge bg-warning text-dark">{t('security_settings.setup_is_not_yet_complete')}</div>}
           </div>
           </div>
         </div>
         </div>
 
 

+ 1 - 1
apps/app/src/components/Admin/Security/LdapSecuritySettingContents.jsx

@@ -73,7 +73,7 @@ class LdapSecuritySettingContents extends React.Component {
               </label>
               </label>
             </div>
             </div>
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('ldap') && isLdapEnabled)
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('ldap') && isLdapEnabled)
-              && <div className="badge bg-warning">{t('security_settings.setup_is_not_yet_complete')}</div>}
+              && <div className="badge bg-warning text-dark">{t('security_settings.setup_is_not_yet_complete')}</div>}
           </div>
           </div>
         </div>
         </div>
 
 

+ 1 - 1
apps/app/src/components/Admin/Security/LocalSecuritySettingContents.jsx

@@ -78,7 +78,7 @@ class LocalSecuritySettingContents extends React.Component {
               </label>
               </label>
             </div>
             </div>
             {!adminGeneralSecurityContainer.state.setupStrategies.includes('local') && isLocalEnabled && (
             {!adminGeneralSecurityContainer.state.setupStrategies.includes('local') && isLocalEnabled && (
-              <div className="badge bg-warning">{t('security_settings.setup_is_not_yet_complete')}</div>
+              <div className="badge bg-warning text-dark">{t('security_settings.setup_is_not_yet_complete')}</div>
             )}
             )}
           </div>
           </div>
         </div>
         </div>

+ 1 - 1
apps/app/src/components/Admin/Security/OidcSecuritySettingContents.jsx

@@ -63,7 +63,7 @@ class OidcSecurityManagementContents extends React.Component {
               </label>
               </label>
             </div>
             </div>
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('oidc') && isOidcEnabled)
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('oidc') && isOidcEnabled)
-              && <div className="badge bg-warning">{t('security_settings.setup_is_not_yet_complete')}</div>}
+              && <div className="badge bg-warning text-dark">{t('security_settings.setup_is_not_yet_complete')}</div>}
           </div>
           </div>
         </div>
         </div>
 
 

+ 1 - 1
apps/app/src/components/Admin/Security/SamlSecuritySettingContents.jsx

@@ -80,7 +80,7 @@ class SamlSecurityManagementContents extends React.Component {
               </label>
               </label>
             </div>
             </div>
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('saml') && isSamlEnabled)
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('saml') && isSamlEnabled)
-              && <div className="badge bg-warning">{t('security_settings.setup_is_not_yet_complete')}</div>}
+              && <div className="badge bg-warning text-dark">{t('security_settings.setup_is_not_yet_complete')}</div>}
           </div>
           </div>
         </div>
         </div>
 
 

+ 1 - 1
apps/app/src/components/Admin/Security/ShareLinkSetting.tsx

@@ -129,7 +129,7 @@ const ShareLinkSetting = (props: ShareLinkSettingProps) => {
             </label>
             </label>
           </div>
           </div>
           {!setupStrategies.includes('local') && disableLinkSharing && (
           {!setupStrategies.includes('local') && disableLinkSharing && (
-            <div className="badge bg-warning">{t('security_settings.setup_is_not_yet_complete')}</div>
+            <div className="badge bg-warning text-dark">{t('security_settings.setup_is_not_yet_complete')}</div>
           )}
           )}
         </div>
         </div>
       </div>
       </div>

+ 1 - 1
apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx

@@ -158,7 +158,7 @@ export const UserGroupTable: FC<Props> = (props: Props) => {
                 <td>
                 <td>
                   <ul className="list-inline">
                   <ul className="list-inline">
                     {users != null && users.map((user) => {
                     {users != null && users.map((user) => {
-                      return <li key={user._id} className="list-inline-item badge rounded-pill bg-warning">{user.username}</li>;
+                      return <li key={user._id} className="list-inline-item badge rounded-pill bg-warning text-dark">{user.username}</li>;
                     })}
                     })}
                   </ul>
                   </ul>
                 </td>
                 </td>

+ 1 - 1
apps/app/src/components/Admin/Users/ExternalAccountTable.tsx

@@ -85,7 +85,7 @@ const ExternalAccountTable = (props: ExternalAccountTableProps): JSX.Element =>
                 <td>
                 <td>
                   {ea.user.password
                   {ea.user.password
                     ? (<span className="badge bg-info">{t('user_management.set')}</span>)
                     ? (<span className="badge bg-info">{t('user_management.set')}</span>)
-                    : (<span className="badge bg-warning">{t('user_management.unset')}</span>)
+                    : (<span className="badge bg-warning text-dark">{t('user_management.unset')}</span>)
                   }
                   }
                 </td>
                 </td>
                 <td>{dateFnsFormat(new Date(ea.createdAt), 'yyyy-MM-dd')}</td>
                 <td>{dateFnsFormat(new Date(ea.createdAt), 'yyyy-MM-dd')}</td>

+ 2 - 2
apps/app/src/components/Admin/Users/UserTable.tsx

@@ -35,7 +35,7 @@ const UserTable = (props: UserTableProps) => {
         text = 'Active';
         text = 'Active';
         break;
         break;
       case 3:
       case 3:
-        additionalClassName = 'bg-warning';
+        additionalClassName = 'bg-warning text-dark';
         text = 'Suspended';
         text = 'Suspended';
         break;
         break;
       case 4:
       case 4:
@@ -158,7 +158,7 @@ const UserTable = (props: UserTableProps) => {
                     </span>
                     </span>
                   )}
                   )}
                   {(user.readOnly) && (
                   {(user.readOnly) && (
-                    <span className="badge bg-light rounded-pill ml-2">
+                    <span className="badge bg-light text-dark rounded-pill ml-2">
                       {t('admin:user_management.user_table.read_only')}
                       {t('admin:user_management.user_table.read_only')}
                     </span>
                     </span>
                   )}
                   )}

+ 1 - 1
apps/app/src/components/Common/CountBadge.tsx

@@ -10,7 +10,7 @@ const CountBadge: FC<CountProps> = (props:CountProps) => {
 
 
 
 
   return (
   return (
-    <span className="grw-count-badge px-2 badge rounded-pill bg-light">
+    <span className="grw-count-badge px-2 badge rounded-pill bg-light text-dark">
       { count == null && <span className="text-muted">―</span> }
       { count == null && <span className="text-muted">―</span> }
       { count != null && count + offset }
       { count != null && count + offset }
     </span>
     </span>

+ 1 - 1
apps/app/src/components/PageEditorByHackmd.tsx

@@ -380,7 +380,7 @@ export const PageEditorByHackmd = (): JSX.Element => {
 
 
           { isHackmdDocumentOutdated && (
           { isHackmdDocumentOutdated && (
             <div className="card border-warning">
             <div className="card border-warning">
-              <div className="card-header bg-warning"><i className="icon-fw icon-info"></i> {t('hackmd.draft_outdated')}</div>
+              <div className="card-header bg-warning text-dark"><i className="icon-fw icon-info"></i> {t('hackmd.draft_outdated')}</div>
               <div className="card-body text-center">
               <div className="card-body text-center">
                 {t('hackmd.based_on_revision')}&nbsp;
                 {t('hackmd.based_on_revision')}&nbsp;
                 { pageData != null && (
                 { pageData != null && (

+ 1 - 1
apps/app/src/components/PageStatusAlert.tsx

@@ -95,7 +95,7 @@ export const PageStatusAlert = (): JSX.Element => {
       : <span dangerouslySetInnerHTML={{ __html: `${usernameComponentToString} ${t('edited this page')}` }} />;
       : <span dangerouslySetInnerHTML={{ __html: `${usernameComponentToString} ${t('edited this page')}` }} />;
 
 
     return {
     return {
-      additionalClasses: ['bg-warning'],
+      additionalClasses: ['bg-warning text-dark'],
       label:
       label:
   <>
   <>
     <i className="icon-fw icon-bulb"></i>
     <i className="icon-fw icon-bulb"></i>

+ 1 - 1
apps/app/src/components/TagList.tsx

@@ -44,7 +44,7 @@ const TagList: FC<TagListProps> = (props:(TagListProps & typeof defaultProps)) =
           prefetch={false}
           prefetch={false}
         >
         >
           <div className="text-truncate list-tag-name">{tag.name}</div>
           <div className="text-truncate list-tag-name">{tag.name}</div>
-          <div className="ml-4 my-auto py-1 px-2 list-tag-count badge bg-primary text-white">{tag.count}</div>
+          <div className="ml-4 my-auto py-1 px-2 list-tag-count badge bg-primary">{tag.count}</div>
         </Link>
         </Link>
       );
       );
     });
     });

+ 1 - 1
apps/app/src/features/growi-plugin/client/components/Admin/PluginsExtensionPageContents/PluginCard.tsx

@@ -119,7 +119,7 @@ export const PluginCard = (props: Props): JSX.Element => {
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <div className="card-footer px-5 border-top-0 mp-bg-light-blue">
+      <div className="card-footer px-5 border-top-0">
         <p className="d-flex justify-content-between align-self-center mb-0">
         <p className="d-flex justify-content-between align-self-center mb-0">
         </p>
         </p>
       </div>
       </div>

+ 1 - 1
apps/app/src/features/questionnaire/client/components/QuestionnaireToast.tsx

@@ -76,7 +76,7 @@ const QuestionnaireToast = ({ questionnaireOrder }: QuestionnaireToastProps): JS
           <span aria-hidden="true" className="text-light">&times;</span>
           <span aria-hidden="true" className="text-light">&times;</span>
         </button>
         </button>
       </div>
       </div>
-      <div className="toast-body bg-light d-flex justify-content-end">
+      <div className="toast-body bg-light text-dark d-flex justify-content-end">
         <button type="button" className="btn btn-secondary mr-3" onClick={answerBtnClickHandler}>{t('questionnaire.answer')}</button>
         <button type="button" className="btn btn-secondary mr-3" onClick={answerBtnClickHandler}>{t('questionnaire.answer')}</button>
         <button type="button" className="btn btn-secondary" onClick={denyBtnClickHandler}>{t('questionnaire.deny')}</button>
         <button type="button" className="btn btn-secondary" onClick={denyBtnClickHandler}>{t('questionnaire.deny')}</button>
       </div>
       </div>

+ 1 - 1
packages/editor/src/components/playground/Playground.tsx

@@ -22,7 +22,7 @@ export const Playground = (): JSX.Element => {
         <div className="flex-expand-vert">
         <div className="flex-expand-vert">
           <CodeMirrorEditorContainer ref={containerRef} />
           <CodeMirrorEditorContainer ref={containerRef} />
         </div>
         </div>
-        <div className="flex-expand-vert d-none d-lg-flex bg-light border-start border-dark-subtle p-3">
+        <div className="flex-expand-vert d-none d-lg-flex bg-light text-dark border-start border-dark-subtle p-3">
           <PlaygroundController />
           <PlaygroundController />
         </div>
         </div>
       </div>
       </div>