Skip to content

Commit 2461316

Browse files
committed
combined nav bars on the same line
1 parent 804fc47 commit 2461316

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

src/app/components/StateRoute/StateRoute.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const StateRoute = (props: StateRouteProps) => {
6969
<NavLink
7070
to='/'
7171
className={(navData) =>
72-
navData.isActive ? 'is-active router-link map-tab' : 'router-link map-tab'
72+
navData.isActive ? 'is-active router-link map-tab map-tab1' : 'router-link map-tab'
7373
}
7474
end
7575
>

src/app/styles/layout/_stateContainer.scss

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,27 @@
8686

8787
.router-link {
8888
height: 100%;
89-
width: 34%;
89+
// width: 34%;
90+
width: 8%;
9091
display: flex;
9192
justify-content: center;
9293
align-items: center;
9394
background-color: $navbar-unselected;
9495
text-decoration: none;
9596
color: $navbar-unselected-text;
9697

97-
border-top-right-radius: 10px;
98-
border-top-left-radius: 10px;
98+
// border-top-right-radius: 10px;
99+
// border-top-left-radius: 10px;
100+
}
101+
102+
.map-tab1 {
103+
border-top-left-radius: 5px;
104+
border-bottom-left-radius: 5px;
105+
}
106+
107+
.accessibility-tab {
108+
border-top-right-radius: 5px;
109+
border-bottom-right-radius: 5px;
99110
}
100111

101112
.router-link:hover {
@@ -108,16 +119,20 @@
108119
}
109120

110121
.navbar {
111-
background-color: $navbar-background;
122+
// background-color: $navbar-background;
112123
display: flex;
113124
flex-direction: row;
114-
justify-content: flex-start;
125+
justify-content: center;
115126
align-items: center;
116127
height: 30px;
117-
position: sticky;
118-
top: 40px; //should revisit to figure out a more dynamic way of sticking the navbar to the bottom of the main-navbar
119-
left: 0px;
120-
z-index: 1;
128+
position: fixed;
129+
top: 4px; //should revisit to figure out a more dynamic way of sticking the navbar to the bottom of the main-navbar // <- tried placing the main nav on the same line to save space but ran into problems with the svg div of the tree + animation. Will need closer inspection
130+
left: 50%;
131+
transform: translateX(-50%);
132+
width: 65vw;
133+
z-index: 2;
134+
135+
121136
@extend %disable-highlight;
122137
}
123138

@@ -225,9 +240,10 @@
225240
z-index: 2;
226241
}
227242

228-
.state-container .router-link {
229-
border: 0.5px solid black;
230-
}
243+
// .state-container .router-link {
244+
// border: 0.5px solid rgba(0, 0, 0, 0.5);
245+
// border-bottom: none;
246+
// }
231247

232248
.tooltipData {
233249
background-color: #373737;

0 commit comments

Comments
 (0)