Merge branch 'develop' into ccb

This commit is contained in:
makabe 2024-02-05 19:39:37 +09:00
commit ce3deecd1b
3 changed files with 21 additions and 15 deletions

View File

@ -1166,7 +1166,13 @@ const DictationPage: React.FC = (): JSX.Element => {
{(isChangeTranscriptionistPopupOpen || !isLoading) &&
tasks.length !== 0 &&
tasks.map((x) => (
<tr key={x.audioFileId}>
<tr
key={x.audioFileId}
style={{
backgroundColor:
x.priority === "01" ? "#ff00004f" : "#ffffff",
}}
>
<td className={styles.clm0}>
<ul className={styles.menuInTable}>
<li>

View File

@ -1343,23 +1343,23 @@ _:-ms-lang(x)::-ms-backdrop,
.tableHeader th .hasSort:hover::before {
opacity: 1;
}
.tableHeader th .hasSort.isActiveAz::before {
opacity: 1;
}
.tableHeader th .hasSort.isActiveAz:hover::before {
border-top: none;
border-right: 0.35rem transparent solid;
border-bottom: 0.4rem #ffffff solid;
border-left: 0.35rem transparent solid;
}
.tableHeader th .hasSort.isActiveZa::before {
border-top: none;
border-right: 0.35rem transparent solid;
border-bottom: 0.4rem #ffffff solid;
border-left: 0.35rem transparent solid;
opacity: 1;
}
.tableHeader th .hasSort.isActiveZa:hover::before {
border-top: none;
border-right: 0.35rem transparent solid;
border-bottom: 0.4rem #ffffff solid;
border-left: 0.35rem transparent solid;
}
.tableHeader th .hasSort.isActiveAz::before {
border-top: none;
border-right: 0.35rem transparent solid;
border-bottom: 0.4rem #ffffff solid;
border-left: 0.35rem transparent solid;
opacity: 1;
}
.tableHeader th .hasSort.isActiveAz:hover::before {
border-top: 0.4rem #ffffff solid;
border-right: 0.35rem transparent solid;
border-bottom: none;

View File

@ -89,8 +89,8 @@ declare const classNames: {
readonly snackbarIcon: "snackbarIcon";
readonly snackbarIconClose: "snackbarIconClose";
readonly hasSort: "hasSort";
readonly isActiveAz: "isActiveAz";
readonly isActiveZa: "isActiveZa";
readonly isActiveAz: "isActiveAz";
readonly noLine: "noLine";
readonly home: "home";
readonly pgHome: "pgHome";