itizawa před 5 roky
rodič
revize
8ec8a0e0ab

+ 1 - 1
src/client/js/components/Admin/Common/AdminNavigation.jsx

@@ -39,7 +39,7 @@ const AdminNavigation = (props) => {
     return (
     return (
       <a
       <a
         href={isRoot ? '/admin' : urljoin('/admin', menu)}
         href={isRoot ? '/admin' : urljoin('/admin', menu)}
-        className={`${pageTransitionClassName} ${isActive && 'active'}`}
+        className={`${pageTransitionClassName} ${isActive ? 'active' : ''}`}
       >
       >
         <MenuLabel menu={menu} />
         <MenuLabel menu={menu} />
       </a>
       </a>

+ 3 - 3
src/client/js/components/Navbar/ThreeStrandedButton.jsx

@@ -26,7 +26,7 @@ const ThreeStrandedButton = (props) => {
       >
       >
         <button
         <button
           type="button"
           type="button"
-          className={`btn btn-outline-primary view-button ${editorMode === 'view' && 'active'} ${isBtnDisabled && 'disabled'}`}
+          className={`btn btn-outline-primary view-button ${editorMode === 'view' ? 'active' : ''} ${isBtnDisabled ? 'disabled' : ''}`}
           onClick={() => { threeStrandedButtonClickedHandler('view') }}
           onClick={() => { threeStrandedButtonClickedHandler('view') }}
         >
         >
           <i className="icon-control-play icon-fw grw-three-stranded-button-icon" />
           <i className="icon-control-play icon-fw grw-three-stranded-button-icon" />
@@ -34,7 +34,7 @@ const ThreeStrandedButton = (props) => {
         </button>
         </button>
         <button
         <button
           type="button"
           type="button"
-          className={`btn btn-outline-primary edit-button ${editorMode === 'edit' && 'active'} ${isBtnDisabled && 'disabled'}`}
+          className={`btn btn-outline-primary edit-button ${editorMode === 'edit' ? 'active' : ''} ${isBtnDisabled ? 'disabled' : ''}`}
           onClick={() => { threeStrandedButtonClickedHandler('edit') }}
           onClick={() => { threeStrandedButtonClickedHandler('edit') }}
         >
         >
           <i className="icon-note icon-fw grw-three-stranded-button-icon" />
           <i className="icon-note icon-fw grw-three-stranded-button-icon" />
@@ -42,7 +42,7 @@ const ThreeStrandedButton = (props) => {
         </button>
         </button>
         <button
         <button
           type="button"
           type="button"
-          className={`btn btn-outline-primary hackmd-button ${editorMode === 'hackmd' && 'active'} ${isBtnDisabled && 'disabled'}`}
+          className={`btn btn-outline-primary hackmd-button ${editorMode === 'hackmd' ? 'active' : ''} ${isBtnDisabled ? 'disabled' : ''}`}
           onClick={() => { threeStrandedButtonClickedHandler('hackmd') }}
           onClick={() => { threeStrandedButtonClickedHandler('hackmd') }}
         >
         >
           <i className="fa fa-fw fa-file-text-o grw-three-stranded-button-icon" />
           <i className="fa fa-fw fa-file-text-o grw-three-stranded-button-icon" />

+ 1 - 1
src/client/js/components/PageAccessoriesModal.jsx

@@ -95,7 +95,7 @@ const PageAccessoriesModal = (props) => {
 
 
   return (
   return (
     <React.Fragment>
     <React.Fragment>
-      <Modal size="xl" isOpen={props.isOpen} toggle={closeModalHandler} className={`grw-page-accessories-modal ${isWindowExpanded && 'grw-modal-expanded'} `}>
+      <Modal size="xl" isOpen={props.isOpen} toggle={closeModalHandler} className={`grw-page-accessories-modal ${isWindowExpanded ? 'grw-modal-expanded' : ''} `}>
         <ModalHeader className="p-0" toggle={closeModalHandler} close={buttons}>
         <ModalHeader className="p-0" toggle={closeModalHandler} close={buttons}>
           <CustomNav activeTab={activeTab} navTabMapping={navTabMapping} onNavSelected={switchActiveTab} hideBorderBottom />
           <CustomNav activeTab={activeTab} navTabMapping={navTabMapping} onNavSelected={switchActiveTab} hideBorderBottom />
         </ModalHeader>
         </ModalHeader>

+ 1 - 1
src/client/js/components/PageAccessoriesModalControl.jsx

@@ -58,7 +58,7 @@ const PageAccessoriesModalControl = (props) => {
             <div id={`shareLink-btn-wrapper-for-tooltip-for-${accessory.name}`}>
             <div id={`shareLink-btn-wrapper-for-tooltip-for-${accessory.name}`}>
               <button
               <button
                 type="button"
                 type="button"
-                className={`btn btn-link grw-btn-page-accessories ${accessory.disabled && 'disabled'}`}
+                className={`btn btn-link grw-btn-page-accessories ${accessory.disabled ? 'disabled' : ''}`}
                 onClick={() => pageAccessoriesContainer.openPageAccessoriesModal(accessory.name)}
                 onClick={() => pageAccessoriesContainer.openPageAccessoriesModal(accessory.name)}
               >
               >
                 {accessory.Icon}
                 {accessory.Icon}