Skip to content

Commit

Permalink
Reconfiguration of details componants
Browse files Browse the repository at this point in the history
regarding the #78

card componant added on the detailspage componants
card/grid componants resized
  • Loading branch information
IremToroslu committed Jun 6, 2021
1 parent 1d0c686 commit 2e876db
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
4 changes: 2 additions & 2 deletions frontend/src/components/details/ScenarioComponent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ScenarioComponent extends Component {
console.log(this.props);

return (
<Container fluid={true} style={{ backgroundColor: 'white',paddingRight:0,paddingLeft:0}} >
<Container fluid={true} style={{ backgroundColor: '#ededed',paddingRight:0,paddingLeft:0}} >
<NavbarComponent
loadComparePage={this.props.compareCanvas}
onCompareClick={this.props.onCompareClick}
Expand All @@ -31,7 +31,7 @@ class ScenarioComponent extends Component {
<PieChart/>
</Col>
</Row>
<Row style={{marginLeft:10,marginBottom:10}}>
<Row style={{marginLeft:10,marginBottom:10,marginTop:35}}>
<Col xs={12} sm={12} md={12} lg={11} className='TableContainer' >
<Table></Table>
</Col>
Expand Down
43 changes: 22 additions & 21 deletions frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ select {
}

body {
background-color: #e7e7e7;
background-color: #ededed;
font-family: Muli;
font-style: normal;
font-weight: normal;
Expand Down Expand Up @@ -130,7 +130,7 @@ body {
/* Reconfiguration of the icon style on the header bar */
.HeaderIconSyle {
font-size: 35px;
color: #dbdbdb;
color: #ededed;
padding-right: 100;
margin-right: 10px;
margin-top: 10px;
Expand Down Expand Up @@ -236,22 +236,7 @@ body {

}

.TableContainer{

background-color: #FFFFFF;
border:2px solid #00b300;
border-color: #00b300;
border-radius: 4px;
cursor: 'pointer';
/* min-width: 500px;
max-width: 500px; */
margin-left: 10px;
margin-right:10px;
margin-bottom: 5px;
margin-top:5px;
min-height: 600px;
max-height: 600px;
}

/* Reconfiguration of the text style on details pages */
.DetailsPageTextContent {
Expand Down Expand Up @@ -285,7 +270,7 @@ body {
.CardsContainer {

background-color: #FFFFFF;
border:2px solid #00b300;
/* border:0.5px solid #00b300; */
border-color: #00b300;
border-radius: 4px;
cursor: 'pointer';
Expand All @@ -298,13 +283,29 @@ body {
.PieChartCardsContainer {

background-color: #FFFFFF;
border:2px solid #00b300;
/* border:0.5px solid #00b300; */
border-color: #00b300;
border-radius: 4px;
cursor: 'pointer';
min-width: 300;
max-width: 360;
}
.TableContainer{

background-color: #FFFFFF;
/* border:0.5px solid #00b300; */
border-color: #00b300;
border-radius: 4px;
cursor: 'pointer';
/* min-width: 500px;
max-width: 500px; */
margin-left: 10px;
margin-right:10px;
margin-bottom: 5px;
margin-top:5px;
min-height: 600px;
max-height: 600px;
}
.miniCardContainer {
display: inline-block;
margin-right: 30;
Expand All @@ -330,7 +331,7 @@ body {
font-style: normal;
font-weight: normal;
font-size: 18px;
color: #dbdbdb;
color: #ededed;
padding-right: 100;
margin-bottom: 3px;
letter-spacing: 0.5px;
Expand Down Expand Up @@ -386,7 +387,7 @@ body {
font-weight: normal;
font-size: 18px;
letter-spacing: 0.2px;
color: #b5b4b9;
color: #ededed;
margin-left: 5px;
}
.SideBarTitle:hover {
Expand Down

0 comments on commit 2e876db

Please sign in to comment.