Merge branch 'master' into feature/go-backend

src/components/boris/BorisStatsGitCard/styles.module.scss

@@ -15,4 +15,5 @@
 
 .subject {
   font: $font_14_regular;
+  word-break: break-word;
 }

src/components/comment/CommentEmbedBlock/styles.scss

@@ -25,7 +25,7 @@
     left: 0;
     width: 100%;
     height: 100%;
-    z-index: 7;
+    z-index: 5;
   }
 
   svg {

src/components/flow/Cell/index.tsx

@@ -134,7 +134,7 @@ const Cell: FC<IProps> = ({
 
           <Link className={classNames(styles.face)} to={`/post${id}`}>
             <div className={styles.face_content}>
-              {title && !text && <div className={styles.title}>{title}</div>}
+              {!text && <div className={styles.title}>{title || '...'}</div>}
 
               {!!text && !!thumbnail && (
                 <div className={styles.text}>

src/components/flow/Cell/styles.scss

@@ -30,8 +30,8 @@
     }
 
     .title {
-      opacity: 0;
-      transform: translate(0, 10px);
+      //opacity: 0;
+      //transform: translate(-3px, 3px);
     }
   }
   @include outer_shadow();

src/components/flow/FlowRecentItem/index.tsx

@@ -20,7 +20,7 @@ const FlowRecentItem: FC<IProps> = ({ node, has_new }) => {
       </div>
 
       <div className={styles.info}>
-        <div className={styles.title}>{node.title}</div>
+        <div className={styles.title}>{node.title || '...'}</div>
         <div className={styles.comment}>{getPrettyDate(node.created_at)}</div>
       </div>
     </Link>

src/constants/api.ts

@@ -11,7 +11,6 @@ export const API = {
     MESSAGE_SEND: (username: string) => `/user/user/${username}/messages`,
     GET_UPDATES: '/user/updates',
     REQUEST_CODE: (code?: string) => `/user/restore/${code || ''}`,
-
     UPLOAD: (target, type) => `/upload/${target}/${type}`,
   },
   NODE: {

src/containers/flow/FlowLayout/styles.scss

@@ -44,14 +44,15 @@ $cols: $content_width / $cell;
     grid-template-columns: repeat(2, 1fr);
     grid-template-rows: 40vh 50vw;
     grid-auto-rows: 50vw;
+    grid-column-gap: $gap / 2;
+    grid-row-gap: $gap / 2;
+    padding: 0 $gap / 2;
   }
 
   @media (max-width: $cell * 2) {
     grid-template-columns: repeat(2, 1fr);
     grid-template-rows: 40vh 50vw;
     grid-auto-rows: 50vw;
-    grid-column-gap: $gap;
-    grid-row-gap: $gap;
   }
 }
 

src/styles/global.scss

@@ -49,9 +49,11 @@ body {
   &:global(.double) {
     height: $spc * 2;
   }
+
   &:global(.quadro) {
     height: $spc * 4;
   }
+
   &:global(.sixty) {
     height: $spc * 6;
   }
@@ -83,6 +85,24 @@ body {
   color: #555555;
 }
 
+:global {
+  .todo, .done {
+    color: #333333;
+    border-radius: 3px;
+    padding: 0 2px;
+    font: $font_14_semibold;
+    text-transform: uppercase;
+  }
+
+  .todo {
+    background-color: $red;
+  }
+
+  .done {
+    background-color: $green;
+  }
+}
+
 :global(h2) {
   font: $font_24_bold;
 }

src/utils/dom.ts

@@ -94,6 +94,8 @@ export const formatText = (text: string): string =>
         )
         .replace(/:\/\//gim, ':|--|')
         .replace(/(\/\/[^\n]+)/gim, '<span class="grey">$1</span>')
+        .replace(/\/\/\s*(todo|туду):?\s*([^\n]+)/gim, '// <span class="todo">$1</span> $2')
+        .replace(/\/\/\s*(done|сделано|сделал|готово|fixed|пофикшено|фиксед):?\s*([^\n]+)/gim, '// <span class="done">$1</span> $2')
         .replace(/(\*\*[\s\S]*?\*\*)/gim, '<b class="bold white">$1</b>')
         .replace(/(\_\_[\s\S]*?\_\_)/gim, '<i>$1</i>')
         .replace(/(\!\![\s\S]*?(\!\!|\n|$))/gim, '<span class="green">$1</span>')