Skip to content

Commit d1aff12

Browse files
committed
merge main
2 parents 19ccc23 + 18e4ba2 commit d1aff12

File tree

3 files changed

+34
-5
lines changed

3 files changed

+34
-5
lines changed

package-lock.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/tdb-dashboard/src/App.css

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,26 @@ button.graphiql-tab-add>svg
10761076
color:white;
10771077
}
10781078
1079+
<<<<<<< HEAD
1080+
=======
1081+
1082+
.graphiql-query-editor{
1083+
width: 100%;
1084+
height: 100%;
1085+
}
1086+
.graphiql-editor{
1087+
width: 100%;
1088+
height: 100%;
1089+
}
1090+
.graphiql-query-editor-wrapper{
1091+
width: 100%;
1092+
height: 100%;
1093+
}
1094+
1095+
.mainGraphIql{
1096+
height : calc(100vh - 80px);
1097+
}
1098+
>>>>>>> main
10791099
10801100
.graphiql-query-editor{
10811101
width: 100%;

packages/tdb-dashboard/src/pages/FreeTextSearch.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import Alert from "react-bootstrap/Alert";
1616
import { DisplayNoIndexingAction } from "../components/DisplayNoIndexingAction";
1717
import { BsSearch } from "react-icons/bs"
1818
import InputGroup from 'react-bootstrap/InputGroup';
19+
import {FiAlertTriangle} from 'react-icons/fi'
1920

2021

2122
export function FreeTextSearch() {
@@ -87,12 +88,17 @@ export function FreeTextSearch() {
8788

8889
let page = Math.ceil(start/5)
8990

90-
// <Alert variant="warning" className="mx-4 ml-4 mr-4"><h5>This is an experimental feature</h5></Alert>
91-
// <h3 className="text-warning text-upper text-center">Experimental Feature</h3>
91+
/*
92+
<Alert variant="primary bg-dark text-warning" className="mx-4 ml-4 mr-4">
93+
<span className="d-flex justify-content-center">
94+
<FiAlertTriangle size={24} className="mr-3"/><h5>Experimental Feature</h5></span></Alert>
95+
*/
9296
return <Layout showLeftSideBar={true} mainClassName={"mt-4"}>
93-
94-
95-
{commit && <div className="d-flex">
97+
{commit && <div className="d-flex flex-column">
98+
<Alert variant="primary bg-dark text-warning" className="mx-4 ml-4 mr-4">
99+
<span className="d-flex justify-content-center">
100+
<FiAlertTriangle size={24} className="mr-3"/><h5>Experimental Feature</h5></span></Alert>
101+
96102
<InputGroup className="mb-3">
97103
<Form.Control ref={search} style={{maxWidth:"500px"}} type="text" placeholder="Search" className="ml-auto"/>
98104
<Button onClick={onClickHandler} variant="light" className="mr-auto"><BsSearch/></Button>

0 commit comments

Comments
 (0)