Skip to content

Commit 9e9a225

Browse files
authored
Merge pull request #71 from NeuroJSON/fangq
Adjust deployment branch mapping - main to production
2 parents 5131fe8 + 7eb4a37 commit 9e9a225

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ const NavItems: React.FC = () => {
105105
<Typography
106106
align="center"
107107
fontWeight={600}
108-
textTransform="uppercase"
109108
lineHeight={"1.5rem"}
110109
letterSpacing={"0.05rem"}
111110
sx={{
112111
color: Colors.white,
113112
transition: "color 0.3s ease, transform 0.3s ease",
113+
textTransform: "uppercase",
114114
"&:hover": {
115115
transform: "scale(1.2)",
116116
cursor: "pointer",

0 commit comments

Comments
 (0)