cosmetics

pull/1133/head
gabrielburnworth 2019-03-20 12:58:24 -07:00
parent e40117b615
commit 2ecacecc99
7 changed files with 16 additions and 12 deletions

View File

@ -20,7 +20,7 @@ describe("<SensorReadingsTable />", () => {
it("renders", () => {
const wrapper = mount(<SensorReadingsTable {...fakeProps()} />);
const txt = wrapper.text().toLowerCase();
["sensor", "value", "mode", "position", "time",
["sensor", "value", "mode", "(x, y, z)", "time",
"(pin 1)", "10, 20, 30", "digital"]
.map(string => expect(txt).toContain(string));
});

View File

@ -35,7 +35,7 @@ const TableHeader = () =>
</th>
<th style={{ width: `${TableColWidth.location}px` }}>
<label>
{t("Position (x, y, z)")}
{t("(x, y, z)")}
</label>
</th>
<th style={{ width: `${TableColWidth.date}px` }}>

View File

@ -368,7 +368,6 @@ a {
}
}
.sensor-history-table-contents {
display: block;
max-height: 20rem;
overflow-y: auto;
}
@ -832,6 +831,9 @@ ul {
}
.settings-menu-button {
float: right;
.fa-gear {
color: $dark_gray;
}
margin-left: 1rem;
margin-top: 0.25rem;
}

View File

@ -132,6 +132,7 @@
.sequence-list-items,
.regimen-list {
button {
text-align: left;
label {
width: 90%;
overflow: hidden;

View File

@ -56,7 +56,7 @@ export const LogsTable = (props: LogsTableProps) => {
<tr>
<th><label>{t("Type")}</label></th>
<th><label>{t("Message")}</label></th>
<th><label>{t("Position (x, y, z)")}</label></th>
<th><label>{t("(x, y, z)")}</label></th>
<th><label>{t("Time")}</label></th>
</tr>
</thead>

View File

@ -80,13 +80,13 @@ export class Logs extends React.Component<LogsProps, Partial<LogsState>> {
const filterBtnColor = this.filterActive ? "green" : "gray";
return <Page className="logs-page">
<Row>
<Col xs={10}>
<Col xs={7}>
<h3>
<i>{t("Logs")}</i>
</h3>
<ToolTip helpText={ToolTips.LOGS} />
</Col>
<Col xs={2}>
<Col xs={5}>
<div className={"settings-menu-button"}>
<Popover position={Position.TOP_RIGHT}>
<i className="fa fa-gear" />

View File

@ -19,12 +19,13 @@ export const AdditionalMenu = (props: AccountMenuProps) => {
<i className="fa fa-question-circle"></i>
{t("Help")}
</Link>}
<div>
<a href={docLink("the-farmbot-web-app")}
target="_blank">
<i className="fa fa-file-text-o"></i>{t("Documentation")}
</a>
</div>
{!DevSettings.futureFeaturesEnabled() &&
<div>
<a href={docLink("the-farmbot-web-app")}
target="_blank">
<i className="fa fa-file-text-o"></i>{t("Documentation")}
</a>
</div>}
<div>
<a onClick={props.logout}>
<i className="fa fa-sign-out"></i>