Skip to content

Commit e521d29

Browse files
authored
Merge pull request #6802 from topcoder-platform/universal_nav
Universal nav
2 parents c223484 + 0281b4a commit e521d29

File tree

21 files changed

+396
-1093
lines changed

21 files changed

+396
-1093
lines changed

.circleci/config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ workflows:
363363
filters:
364364
branches:
365365
only:
366+
- universal_nav
366367
- feat/badges-box
367368
# This is beta env for production soft releases
368369
- "build-prod-beta":

Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ ARG OPTIMIZELY_SDK_KEY
8181
# Gamification
8282
ARG GAMIFICATION_ORG_ID
8383

84+
# Universal Nav
85+
ARG UNIVERSAL_NAV_URL
86+
8487
################################################################################
8588
# Setting of environment variables in the Docker image.
8689

@@ -148,6 +151,9 @@ ENV OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY
148151

149152
ENV GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID
150153

154+
# Universal nav
155+
ENV UNIVERSAL_NAV_URL=$UNIVERSAL_NAV_URL
156+
151157
################################################################################
152158
# Testing and build of the application inside the container.
153159

__tests__/shared/components/Settings/Header/__snapshots__/index.jsx.snap

-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ exports[`renders setting page header correctly 1`] = `
44
<div
55
className="src-shared-components-Settings-Header-___styles__Header___2G763"
66
>
7-
<div
8-
className="src-shared-components-Settings-Header-___styles__title___2Pmjv"
9-
>
10-
<h1>
11-
Profile Settings
12-
</h1>
13-
</div>
147
<ThemedButton
158
active={false}
169
composeAdhocTheme="deeply"

0 commit comments

Comments
 (0)