Skip to content

Commit a68f1f7

Browse files
authored
Merge pull request #16 from oslabs-beta/performanceTabStyling
Updated styling for current button in map tab and data details in per…
2 parents c7c81f0 + 12edd81 commit a68f1f7

File tree

3 files changed

+49
-14
lines changed

3 files changed

+49
-14
lines changed

src/app/components/RenderingFrequency.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,9 @@ const ComponentCard = props => {
9191
<p>{renderFrequency}</p>
9292
</div>
9393
</div>
94-
<div className="DataComponent">
94+
<div className={expand === true ? 'DataComponent' : null} >
9595
{expand === true ? dataComponentArray : null}
9696
</div>
97-
9897
</div>
9998
);
10099
};
@@ -107,11 +106,11 @@ const DataComponent = props => {
107106

108107
// current bug
109108
// we want render time to display first but it gets push to the end of the array
110-
// first pop is because the last item of array is always empty for some reason
109+
// first pop is because the last item of array is always empty for some reason
111110

112111
// const [{ tabs, currentTab }, dispatch] = useStoreContext();
113112
return (
114-
<div>
113+
<div className="borderCheck">
115114
<h4>
116115
{' '}
117116
{header}

src/app/styles/components/_buttons.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,16 @@
118118
cursor: pointer;
119119
}
120120

121+
.current-location {
122+
outline: none;
123+
height: 20px;
124+
margin-bottom: 8px;
125+
width: 70px;
126+
border: transparent;
127+
border-radius: 3px;
128+
font: normal 11px 'Roboto', sans-serif;
129+
}
130+
121131
.empty-button:hover {
122132
color: white;
123133
background-color: $highlight-color;

src/app/styles/components/_renderingFrequency.scss

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,45 @@
1-
.borderStyling{
1+
.borderStyling {
22
border-radius: 5px;
33
border: 1px solid rgba(184, 196, 194, 0.25);
44
box-shadow: 2px 3px 4px 2px rgba(0, 0, 0, 0.2);
5-
width: 40vh;
5+
width: 53vw;
6+
}
7+
8+
.borderCheck {
9+
border-radius: 5px;
10+
border: 1px solid rgba(184, 196, 194, 0.25);
11+
box-shadow: 2px 3px 4px 2px rgba(0, 0, 0, 0.2);
12+
padding:5px;
13+
width: 10vw;
14+
height:25vw;
15+
overflow-y: scroll;
16+
overflow-wrap: break-word;
617
}
718
.DataComponent{
19+
padding-left: 30px;
820
display: flex;
921
flex-direction: row;
10-
width: 40vh
22+
flex-wrap: wrap;
23+
width: 50vw;
24+
height:40vw;
25+
overflow-y: scroll;
26+
overflow-wrap: break-word;
1127
}
28+
29+
1230
.StyledGridElement {
1331
display: flex;
1432
align-items: center;
1533
justify-content: space-between;
1634
background: #242529;
17-
padding: 20px;
18-
width: 40vh;
35+
padding: 20px;
36+
width: 50vw;
1937
height: 5vh;
2038
margin: 20px 10px;
2139
font-family: 'Roboto', sans-serif;
22-
40+
// border-radius: 5px;
41+
// border: 1px solid rgba(184, 196, 194, 0.25);
42+
// box-shadow: 2px 3px 4px 2px rgba(0, 0, 0, 0.2);
2343

2444
h3 {
2545
color: $text-color;
@@ -47,13 +67,18 @@
4767
}
4868
.ExpandStyledGridElement {
4969
display: flex;
70+
flex-direction: row;
5071
align-items: center;
5172
justify-content: space-between;
5273
background: #242529;
5374
padding: 20px;
54-
width: 80vh;
75+
width: 50vw;
76+
// height: 1000px;
5577
margin: 20px 10px;
5678
font-family: 'Roboto', sans-serif;
79+
// border-radius: 5px;
80+
// border: 1px solid rgba(184, 196, 194, 0.25);
81+
// box-shadow: 2px 3px 4px 2px rgba(0, 0, 0, 0.2);
5782

5883

5984
h3 {
@@ -81,8 +106,9 @@
81106
}
82107
}
83108
.RenderRight {
84-
border-radius: 5px;
109+
padding-right: 5px;
85110
background: $blue-color-gradient;
86-
width: 10%;
111+
width: 50px;
87112
padding: 0 0.5em;
88-
}
113+
right: 10%;
114+
}

0 commit comments

Comments
 (0)