diff --git a/src/components/JoinMarkupsModal/index.js b/src/components/JoinMarkupsModal/index.js
index 2efe1500..13021c84 100644
--- a/src/components/JoinMarkupsModal/index.js
+++ b/src/components/JoinMarkupsModal/index.js
@@ -1,5 +1,5 @@
import React, { useCallback, useContext, useState } from "react";
-import { Button, Checkbox, Modal, Table } from "semantic-ui-react";
+import { Button, Checkbox, Form, Modal, Table } from "semantic-ui-react";
import PropTypes from "prop-types";
import TranslationContext from "Layout/TranslationContext";
@@ -9,6 +9,10 @@ import "./styles.scss";
const JoinMarkupsModal = ({ perspectiveId, mode, relations, onClose }) => {
const getTranslation = useContext(TranslationContext);
+ //const [firstTextRelation, setFirstTextRelation] = useState(null);
+ //const [secondTextRelation, setSecondTextRelation] = useState(null);
+ const [typeRelation, setTypeRelation] = useState(null);
+
console.log("perspectiveId====");
console.log(perspectiveId);
@@ -29,7 +33,7 @@ const JoinMarkupsModal = ({ perspectiveId, mode, relations, onClose }) => {
{/* Table 1 */}
-
+
@@ -48,7 +52,7 @@ const JoinMarkupsModal = ({ perspectiveId, mode, relations, onClose }) => {
-
+
@@ -67,6 +71,44 @@ const JoinMarkupsModal = ({ perspectiveId, mode, relations, onClose }) => {
+ {/*
+ ))}
+ */}
+
setTypeRelation(value)}
+ className="lingvo-radio"
+ />
+
+ setTypeRelation(value)}
+ className="lingvo-radio"
+ />
+
+
}
content={getTranslation("Join")}
diff --git a/src/components/JoinMarkupsModal/styles.scss b/src/components/JoinMarkupsModal/styles.scss
index 90ad5f38..1276d32d 100644
--- a/src/components/JoinMarkupsModal/styles.scss
+++ b/src/components/JoinMarkupsModal/styles.scss
@@ -2,18 +2,27 @@
display: flex;
flex-direction: column;
height: 65vh;
- //max-height: 100vh;
+ min-height: 450px;
&__table1 {
height: 50%;
- //flex: 1 0 50%;
padding-bottom: 20px;
}
&__table2 {
height: 50%;
- //flex: 1 0 50%;
overflow-y: auto;
+
+ & .ui.table thead th {
+ position: relative;
+ position: sticky;
+ top: 0;
+ z-index: 1;
+
+ @media only screen and (max-device-width: 767px), only screen and (max-width: 767px) {
+ position: static;
+ }
+ }
}
}
@@ -21,14 +30,34 @@
display: flex;
height: 100%;
- &__first {
+ &__column {
flex: 1 1 33%;
overflow-y: auto;
- }
+ margin: 0 0 0 10px;
- &__second {
- flex: 1 1 33%;
- overflow-y: auto;
+ & .ui.table thead th {
+ position: relative;
+ position: sticky;
+ top: 0;
+ z-index: 1;
+ }
+
+ &:first-of-type {
+ margin: 0 10px 0 0;
+ }
+
+ @media only screen and (max-device-width: 767px), only screen and (max-width: 767px) {
+ margin-left: 5px;
+
+ & .ui.table thead th {
+ position: static;
+ }
+
+ &:first-of-type {
+ margin-right: 5px;
+ margin-left: 0;
+ }
+ }
}
&__actions {