Browse Source

Uses <Led> widget

master
Red Forks 8 years ago
parent
commit
9c096a18e1
2 changed files with 10 additions and 15 deletions
  1. +1
    -1
      package-lock.json
  2. +9
    -14
      src/main-view/container.tsx

+ 1
- 1
package-lock.json View File

@ -2223,7 +2223,7 @@
}
},
"mammoth": {
"version": "git+file:///home/forks/work/mammoth-lib.git#9b732d678717d2ceb783a1d166c73cab81cc7c36",
"version": "git+file:///home/forks/work/mammoth-lib.git#5f57b780468d4f21af61fec92e584bf2c87664b2",
"requires": {
"@types/chokidar": "1.7.4",
"@types/history": "4.6.2",


+ 9
- 14
src/main-view/container.tsx View File

@ -2,22 +2,17 @@ import * as React from "react";
import { connect, Dispatch } from "react-redux";
import { StMainView, StAppWithMainView } from ".";
import { Grid, Row, Col, Table, ButtonToolbar, Button, Panel, FormControl, Checkbox } from "react-bootstrap";
import { Led } from "mammoth/ui/led";
interface Props { };
interface Callbacks { };
function mainView(props: Props & Callbacks) {
const weightPanel = {
color: "#ff4300",
backgroundColor: "black",
fontSize: "7rem",
fontFamily: "\"7bar\"",
};
return <Grid>
<Row style={{ height: "calc(20vh - 50px)" }}>
<Row style={{ height: "20vh" }}>
<Col lg={3}>
<div style={weightPanel}>0.00</div>
<Led text="0.00" />
<ButtonToolbar>
<Button></Button>
<Button disabled></Button>
@ -43,8 +38,8 @@ function mainView(props: Props & Callbacks) {
</Row>
<Row>
<Col lg={8}>
<Row>
<Panel style={{ height: "40vh" }} header="烫褪">
<Row style={{ height: "40vh" }}>
<Panel header="烫褪">
<Col lg={6} >
<Table >
<thead>
@ -66,8 +61,8 @@ function mainView(props: Props & Callbacks) {
</Col>
</Panel>
</Row>
<Row>
<Panel style={{ height: "40vh" }} header="毛剥">
<Row style={{ height: "40vh" }} >
<Panel header="毛剥">
<Col lg={6}>
<Table>
<thead>
@ -90,8 +85,8 @@ function mainView(props: Props & Callbacks) {
</Panel>
</Row>
</Col>
<Col lg={4}>
<Panel style={{ height: "calc(80vh + 20px)" }} header="记录">
<Col lg={4} style={{ height: "80vh" }} >
<Panel header="记录">
<Table>
<thead>
<tr>


Loading…
Cancel
Save