Skip to content

Commit ddfb471

Browse files
authored
Merge pull request #17 from ucfcs/feature/full-width-style
'full-width'
2 parents 516a2e4 + 9f2a577 commit ddfb471

4 files changed

Lines changed: 11 additions & 26 deletions

File tree

duct-drone-app/src/App.css

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
1-
.container {
2-
position: relative;
3-
height: 100%;
4-
width: 100%;
5-
}
6-
.Sidebar {
7-
margin-top:150px;
8-
}
9-
#action-bar{
10-
height: 30%;
11-
}
121
#feed {
132
display: block;
143
border-width: 2px;
15-
height:500px;
4+
height:50%;
165
width:100%;
17-
margin-top: 10px;
186
border-style: solid;
197
color:#007bff;
208
border-radius: 10px;
@@ -24,6 +12,6 @@
2412
}
2513
.swap-area {
2614
width: 100%;
27-
height: 300px;
15+
height: 100%;
2816
text-align: center;
2917
}

duct-drone-app/src/App.jsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,11 @@ class App extends Component {
118118

119119
<div onKeyPress={(e) => console.log(e.key)}>
120120
<Router>
121-
<Container>
122-
<Row style={{ height: '100%', width: '100%', border: 'black' }}>
123-
<Col><div className="Sidebar"><Sidebar /></div></Col>
124-
<Col xs={8}>
121+
<Container fluid={true}>
122+
<Row style={{ height: '100%', width: '100%' }}>
123+
<Col><div><Sidebar /></div></Col>
124+
<Col xs={10}>
125125
<div id="feed" />
126-
<div id="action-bar">
127126
<Switch>
128127
<Route path="/" exact component={Control} />
129128
<Route path="/logs/" render={() =>
@@ -134,7 +133,6 @@ class App extends Component {
134133
} />
135134
</Switch>
136135
<Navigation />
137-
</div>
138136
</Col>
139137
<Col />
140138
</Row>

duct-drone-app/src/Control.css

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#analog-wrapper{
2-
position: relative;
3-
padding-top: 25%;
4-
padding-bottom: 25%;
1+
.ReactNipple {
2+
height: 40%;
53
}

duct-drone-app/src/Control.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Control extends React.Component {
1616
render() {
1717
const isActive = true;
1818
return (
19-
<div id="analog-wrapper">
19+
<>
2020
<ReactNipple
2121
// supports all nipplejs options
2222
// see https://github.com/yoannmoinet/nipplejs#options
@@ -28,7 +28,8 @@ class Control extends React.Component {
2828
// see https://github.com/yoannmoinet/nipplejs#start
2929
onMove={(evt, data) => console.log(evt, data)}
3030
/>
31-
</div>
31+
</>
32+
3233
);
3334
}
3435
}

0 commit comments

Comments
 (0)