Skip to content

version 2 of brand details Page #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Samaamro20 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

version 2 of brand details Page #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6c3f70d
version 2 of brand detials
Samaamro20 Apr 16, 2019
e5a3f95
update style versin 2
Samaamro20 Apr 17, 2019
2d5cb8e
Merge branch 'master' of github.com:FACK1/wellSpent into finalbrnach
Samaamro20 Apr 17, 2019
8491aae
fix conflict
Samaamro20 Apr 17, 2019
2477173
Merge branch 'master' of github.com:FACK1/wellSpent into finalbrnach
Samaamro20 Apr 17, 2019
78e7ce4
Merge branch 'master' into finalbrnach
Samaamro20 Apr 17, 2019
c403741
Done
Samaamro20 Apr 17, 2019
64f5c72
Done
Samaamro20 Apr 17, 2019
fd4f97b
Done
Samaamro20 Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions client/src/components/Brand/brand.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ margin-right: 30px;
display: flex;
flex-direction: row;
text-align: left !important;
margin-bottom: 3%;
}
.score1 {
width: 170px;
Expand Down Expand Up @@ -124,7 +125,7 @@ margin-right: 30px;
margin-bottom: 70px;
}
.MoreDetails {
margin-left: 17px;
margin-left: 10%;
max-width: 100%;
padding-top: 6%;
text-align: left !important;
Expand All @@ -151,7 +152,9 @@ margin-right: 30px;
height: 70px;
border-radius: 5px;
}

.btn-metodolegy-brand {
margin-left: 20%;
height: 40px;
background-color: black;
color: white;
Expand All @@ -166,8 +169,12 @@ margin-right: 30px;
font-size: 12pt;
font-family: "Roboto", sans-serif;
font-weight: bold;
padding-left: -14px;
width: 24%
}
.name2 h3{
text-align: center;
}

.score22 h3 {
text-align: center;
}
Expand Down Expand Up @@ -289,9 +296,15 @@ margin-right: 30px;
}
.They-areas-they-are {
display: initial;
text-align: center !important;
margin-left: 10% !important;
}
.pargrah-brand {
margin-top: 10px;
width: 60%;
float: right;
text-align: center;

}

.detail {
Expand Down Expand Up @@ -471,6 +484,7 @@ margin-right: 30px;
}

.details-feedback-container {
width: 100%;
display: flex;
flex-direction: row;
float: left;
Expand Down
33 changes: 18 additions & 15 deletions client/src/components/Brand/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React from "react";
import back from "./left.png";
import "./brand.css";
import axios from "axios";
import Feedback from "../Feedback";
import { FadeLoader } from "react-spinners";
import { Link } from "react-router-dom";
import defaultimage from "./x.jpg";
import AddFeedback from "../Feedback/add.js";


class Brand extends React.Component {
state = {
info: [],
Expand Down Expand Up @@ -164,12 +164,13 @@ class Brand extends React.Component {
<h3> {environmentscore}</h3>
</div>
<h3 className="name2">Environment Rating </h3>
<div className="pargrah-brand">
<p className="They-areas-they-are">
{ReasonForEnvironmentScore}
</p>
</div>
</div>
<div className="pargrah-brand">
<p className="They-areas-they-are">
{ReasonForEnvironmentScore}
</p>
</div>

<div className="labour2">
<div
className="score22"
Expand All @@ -180,9 +181,12 @@ class Brand extends React.Component {
<h3> {labourscore}</h3>{" "}
</div>
<h3 className="name2">Labour Rating </h3>
</div>
<div className="pargrah-brand">
<div className="pargrah-brand">
<p className="They-areas-they-are">{ReasonForLabourScore}</p>

</div>

</div>
<div className="labour2">
<div
className="score22"
Expand All @@ -193,10 +197,12 @@ class Brand extends React.Component {
<h3> {transparencyscore}</h3>
</div>
<h3 className="name2">Transparency Rating </h3>
</div>
<p className="They-areas-they-are">
{ReasonForTransparencyScore}
</p>
<div className="pargrah-brand">
<p className="They-areas-they-are">
{ReasonForTransparencyScore}
</p>
</div>

</div>
<Link to="/methodology">
<div className="btn-metodolegy-brand">
Expand All @@ -207,9 +213,6 @@ class Brand extends React.Component {
</div>
</div>

<div className="feedback-section">
<Feedback name={name} />
</div>
</div>
<AddFeedback name={name} />
</div>
Expand Down
210 changes: 0 additions & 210 deletions client/src/components/Feedback/feedback.css
View file
Open in desktop

This file was deleted.

Loading