Skip to content

Commit

Permalink
worked on the #37
Browse files Browse the repository at this point in the history
panel and chart components reconfigured
  • Loading branch information
IremToroslu committed May 18, 2021
1 parent 5647c26 commit e9d3936
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions frontend/src/components/details/CompareCanvas.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ const CompareCanvas = () => {
fontWeight: theme.typography.subtitle.fontWeight,
lineHeight: theme.typography.subtitle.lineHeight,
letterSpacing: theme.typography.subtitle.letterSpacing,
marginLeft:80
marginLeft:120
}}> Material Composition </h3>
<PieChart></PieChart>
</Col>
<Col xs={5}>
<Col xs={5} style={{marginLeft:150}}>
<h3
style={{
fontSize: theme.typography.subtitle.fontSize,
fontWeight: theme.typography.subtitle.fontWeight,
lineHeight: theme.typography.subtitle.lineHeight,
letterSpacing: theme.typography.subtitle.letterSpacing,
marginLeft:80
marginLeft:120
}}
> Material Composition </h3>
<PieChart></PieChart>
Expand All @@ -46,7 +46,7 @@ const CompareCanvas = () => {
}}> Results of the impact assessment </h3>
<ColumnChart></ColumnChart>
</Col>
<Col xs={5}>
<Col xs={5} style={{marginLeft:150}}>
<h3
style={{
fontSize: theme.typography.subtitle.fontSize,
Expand Down Expand Up @@ -81,7 +81,7 @@ const CompareCanvas = () => {
lineHeight: theme.typography.subtitle.lineHeight,
letterSpacing: theme.typography.subtitle.letterSpacing,
}}> Impact categories </h3>
<Table></Table>
<div style={{marginBottom:30}}><Table></Table></div>
</Col>
</Row>
</Container>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/details/PanelComponent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React, { Component } from 'react';
import theme from 'resources/theme';
const PanelComponent = (props) => {
return (
<div className='w3-panel w3-padding-small' style={{backgroundColor:'#467d85',marginLeft:15}}>
<div className='w3-panel w3-padding-small' style={{backgroundColor:'#5d8485',marginLeft:15}}>
<div className='w3-row'>
<div className='w3-col s9'>
<h2 className='w3-opacity' style={{color:'white',fontSize:theme.typography.subtitle.fontSize,fontWeight:theme.typography.subtitle.fontWeight,lineHeight:theme.typography.subtitle.lineHeight,letterSpacing:theme.typography.subtitle.letterSpacing,marginTop:6}}>Canvas page</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class SelectVariableComponent extends Component {
))}
</div>
</div>
<button onClick={this.handleSubmit} style={{backgroundColor:theme.uniformStyle.color.sendButtonColor}} className='w3-button w3-teal w3-wide'>
<button onClick={this.handleSubmit} style={{backgroundColor:theme.uniformStyle.color.sendButtonColor}} className='w3-button w3-wide'>
<b style={{fontSize:theme.typography.buttonSendtitle.fontSize,fontWeight:theme.typography.buttonSendtitle.fontWeight,letterSpacing:theme.typography.buttonSendtitle.letterSpacing,lineHeight:theme.typography.buttonSendtitle.lineHeight}}>Send Request</b>
</button>
</div>
Expand Down

0 comments on commit e9d3936

Please sign in to comment.