Skip to content

Commit d118a17

Browse files
committed
Merge branch 'dev' of https://github.com/oslabs-beta/reactime-v23.0 into dependencies
2 parents 50fc9a7 + 5dd9e20 commit d118a17

File tree

3 files changed

+51
-57
lines changed

3 files changed

+51
-57
lines changed

src/app/styles/layout/_bodyContainer.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
overflow: hidden;
44
display: grid;
55
grid-template-columns: min-content 1fr;
6-
grid-template-rows: 90% 5% 5%;
6+
grid-template-rows: 1fr minmax(min-content, 5%) minmax(min-content, 5%);
77
grid-template-areas:
88
'actions states'
99
'travel travel'
1010
'buttons buttons';
1111
}
1212

13-
1413
/* if extension width is less than 500px, stack the body containers */
1514
@media (max-width: 500px) {
1615
.body-container {

src/app/styles/layout/_stateContainer.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
.navbar {
6262
// prevent navbar from scrolling with state/tree display
6363
position: sticky;
64-
top: 0px;
64+
top: 40px; //JR 12.16.23 @12:15pm: this hardcoding is not best practice, should revisit to figure out a more dynamic way of sticking the navbar to the bottom of the main-navbar
6565
left: 0px;
6666
z-index: 1;
6767
@extend %disable-highlight;
@@ -263,5 +263,3 @@
263263
.tooltipData-JSONTree::-webkit-scrollbar-track {
264264
background: #51565e;
265265
}
266-
267-
Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,58 @@
11
.travel-container {
2-
// background: linear-gradient(
3-
// 90deg,
4-
// rgba(41, 41, 41, 1) 0%,
5-
// rgba(51, 51, 51, 1) 50%,
6-
// rgba(41, 41, 41, 1) 100%
7-
// );
8-
// border-color: $border-color;
9-
// display: flex;
10-
// flex-direction: row;
11-
// align-items: center;
12-
// justify-content: space-around;
2+
// background: linear-gradient(
3+
// 90deg,
4+
// rgba(41, 41, 41, 1) 0%,
5+
// rgba(51, 51, 51, 1) 50%,
6+
// rgba(41, 41, 41, 1) 100%
7+
// );
8+
// border-color: $border-color;
9+
// display: flex;
10+
// flex-direction: row;
11+
// align-items: center;
12+
// justify-content: space-around;
1313

14-
display: flex;
15-
flex-direction: row;
16-
align-items: center;
17-
justify-content: space-around;
18-
border: none;
19-
margin-top: 18px;
14+
display: flex;
15+
flex-direction: row;
16+
align-items: center;
17+
justify-content: space-around;
18+
border: none;
2019
}
2120

22-
.visx-group{
23-
margin-top: 10px;
21+
.visx-group {
22+
margin-top: 10px;
2423
}
2524

26-
2725
.react-select-container {
28-
font-size: 16px;
29-
min-width: 90px;
30-
margin: 8px;
31-
.react-select__control {
32-
background-color: $light-grey-four;
33-
border-color: transparent;
34-
@extend %disable-highlight;
35-
}
36-
.react-select__control:hover {
37-
cursor: pointer;
38-
}
39-
.react-select__menu {
40-
background-color: $light-grey-four;
41-
@extend %disable-highlight;
42-
}
43-
.react-select__single-value {
44-
color: white;
45-
}
46-
.react-select__option:hover {
47-
background-color: $fiery-rose;
48-
cursor: pointer;
49-
}
50-
.react-select__option--is-selected,
51-
.react-select__option--is-focused {
52-
background-color: transparent;
53-
cursor: pointer;
54-
55-
}
26+
font-size: 16px;
27+
min-width: 90px;
28+
margin: 8px;
29+
.react-select__control {
30+
background-color: $light-grey-four;
31+
border-color: transparent;
32+
@extend %disable-highlight;
33+
}
34+
.react-select__control:hover {
35+
cursor: pointer;
36+
}
37+
.react-select__menu {
38+
background-color: $light-grey-four;
39+
@extend %disable-highlight;
40+
}
41+
.react-select__single-value {
42+
color: white;
43+
}
44+
.react-select__option:hover {
45+
background-color: $fiery-rose;
46+
cursor: pointer;
47+
}
48+
.react-select__option--is-selected,
49+
.react-select__option--is-focused {
50+
background-color: transparent;
51+
cursor: pointer;
52+
}
5653

57-
// removes the cursor from blinking
58-
.css-w8afj7-Input {
59-
color: transparent;
60-
}
54+
// removes the cursor from blinking
55+
.css-w8afj7-Input {
56+
color: transparent;
57+
}
6158
}

0 commit comments

Comments
 (0)