Skip to content

Commit b76b7dc

Browse files
authored
Merge branch 'staging' into dev-fan
2 parents 23e9d21 + 53db753 commit b76b7dc

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/build-deploy-neurojsonio.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Deploy to Production
33
on:
44
push:
55
branches:
6-
- staging
6+
- main
77
pull_request:
88
branches:
9-
- staging
9+
- main
1010

1111
jobs:
1212
deploy:

.github/workflows/build-deploy-zodiac.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ name: Deploy Zodiac Server
33
on:
44
push:
55
branches:
6-
- dev_hari
76
- dev-fan
87
- dev_mario
9-
- dev_fang
8+
- fangq
109
- staging
1110

1211
jobs:

src/components/NavBar/NavItems.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,11 @@ const NavItems: React.FC = () => {
8888
>
8989
{[
9090
// { text: "ABOUT", url: "https://neurojson.org/Doc/Start" },
91-
{ text: "ABOUT", url: RoutesEnum.ABOUT },
92-
{ text: "WIKI", url: "https://neurojson.org/Wiki" },
93-
{ text: "SEARCH", url: RoutesEnum.SEARCH },
94-
{ text: "DATABASES", url: RoutesEnum.DATABASES },
91+
{ text: "About", url: RoutesEnum.ABOUT },
92+
{ text: "Wiki", url: "https://neurojson.org/Wiki" },
93+
{ text: "Search", url: RoutesEnum.SEARCH },
94+
{ text: "Databases", url: RoutesEnum.DATABASES },
95+
{ text: "V1", url: "https://neurojson.io/v1" },
9596
].map(({ text, url }) => (
9697
<Grid item key={text}>
9798
{url?.startsWith("https") ? (
@@ -109,6 +110,7 @@ const NavItems: React.FC = () => {
109110
sx={{
110111
color: Colors.white,
111112
transition: "color 0.3s ease, transform 0.3s ease",
113+
textTransform: "uppercase",
112114
"&:hover": {
113115
transform: "scale(1.2)",
114116
cursor: "pointer",
@@ -128,6 +130,7 @@ const NavItems: React.FC = () => {
128130
sx={{
129131
color: Colors.white,
130132
transition: "color 0.3s ease, transform 0.3s ease",
133+
textTransform: "uppercase",
131134
"&:hover": {
132135
transform: "scale(1.2)",
133136
cursor: "pointer",

0 commit comments

Comments
 (0)