Merge branch 'master' into wip/migratedb

client/src/common/components/buttons/LockIconBtn.jsx

@@ -10,8 +10,9 @@ export default function LockIconBtn(props) {
         ref={ref}
         size={props.size || 'xs'}
         icon={<FiTarget />}
-        colorScheme='pink'
-        color={'pink.300'}
+        color={active ? 'pink.100' : 'pink.300'}
+        borderColor={active ? undefined : 'pink.300'}
+        backgroundColor={active ? 'pink.300' : undefined}
         variant={active ? 'solid' : 'outline'}
         onClick={clickhandler}
         _focus={{ boxShadow: 'none' }}

client/src/common/components/buttons/RollIconBtn.jsx

@@ -12,7 +12,6 @@ export default function RollIconBtn(props) {
       width={120}
       _focus={{ boxShadow: 'none' }}
       {...rest}
-      disabled
     />
   );
 }

client/src/common/components/views/Paginator.jsx

@@ -6,7 +6,7 @@ import { useInterval } from 'app/hooks/useInterval';
 export default function Paginator(props) {
   const { events, selectedId } = props;
   const LIMIT_PER_PAGE = props.limit || 8;
-  const SCROLL_TIME = props.time * 1000 || 5000;
+  const SCROLL_TIME = props.time * 1000 || 10000;
   const SCROLL_PAST = false;
   const [numEvents, setNumEvents] = useState(0);
   const [page, setPage] = useState([]);

client/src/common/input/EditableText.jsx

@@ -33,9 +33,9 @@ export default function EditableText(props) {
       >
         <EditablePreview
           color={text === '' ? '#666' : 'inherit'}
-          maxWidth='20em'
+          maxWidth='75%'
         />
-        <EditableInput overflowX='hidden' maxWidth='20em' />
+        <EditableInput overflowX='hidden' maxWidth='75%' />
       </Editable>
     </div>
   );

client/src/common/input/EditableTimer.jsx

@@ -34,12 +34,12 @@ export default function EditableTimer(props) {
     if (value === '') return false;
 
     // Time now and time submitedVal
-    const original = stringFromMillis(time, false);
+    const original = stringFromMillis(time + delay, false);
 
     // check if time is different from before
     if (value === original) return false;
 
-    // conver to millis object
+    // convert to millis object
     const millis = timeStringToMillis(value, timeFormat);
 
     // validate with parent
@@ -51,14 +51,8 @@ export default function EditableTimer(props) {
     return true;
   };
 
-  const showOriginal = () => {
-    setValue(stringFromMillis(time, false));
-  };
-
   return (
     <Editable
-      onFocus={() => showOriginal}
-      onEdit={() => showOriginal}
       onChange={(v) => setValue(v)}
       onSubmit={(v) => validateValue(v)}
       value={value}