Skip to content

Commit 26fe4b4

Browse files
authored
feat: set new logo, close nav bar on login, fix progress (#15)
1 parent 456c656 commit 26fe4b4

8 files changed

Lines changed: 31 additions & 17 deletions

File tree

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/App.scss

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ body.home-page::before {
207207
}
208208

209209
.nav__logo {
210-
height: 40px;
210+
height: 36px;
211211
width: auto;
212212
display: block;
213213
}
@@ -599,19 +599,17 @@ body.home-page::before {
599599
width: 100%;
600600
margin-top: 30px;
601601
margin-bottom: 50px;
602-
// margin-left: 0px;
603602
margin-left: 20px;
603+
padding-right: 70px;
604604
}
605605

606606
.step-wrapper {
607607
display: flex;
608608
flex-direction: column;
609609
align-items: center;
610610
flex: 1;
611-
@media (max-width: 768px) {
612-
&:last-child {
613-
flex: 0;
614-
}
611+
&:last-child {
612+
flex: 0;
615613
}
616614
}
617615

@@ -776,7 +774,6 @@ body.home-page::before {
776774

777775
.cards {
778776
padding-top: 4rem;
779-
// grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
780777
margin-top: 3vw;
781778
}
782779

@@ -1101,6 +1098,9 @@ body:not(.home-page) .footer {
11011098
width: 100%;
11021099
flex-wrap: wrap;
11031100
}
1101+
.step-progress {
1102+
padding-right: 70px;
1103+
}
11041104

11051105
.footer__cta,
11061106
.footer__link {
@@ -1124,6 +1124,9 @@ body:not(.home-page) .footer {
11241124
padding-top: 40px;
11251125
}
11261126
}
1127+
.nav__logo {
1128+
margin-left: 20px;
1129+
}
11271130
body.home-page::before {
11281131
min-height: 20%;
11291132
background-position: right top;
@@ -1202,7 +1205,8 @@ body:not(.home-page) .footer {
12021205
}
12031206
}
12041207
.step-progress {
1205-
width: 90%;
1208+
width: 100%;
1209+
padding-right: 40px;
12061210
}
12071211
.behind_scenes {
12081212
margin-left: 48px;
@@ -1271,7 +1275,7 @@ body:not(.home-page) .footer {
12711275
}
12721276

12731277
.nav__logo {
1274-
height: 30px;
1278+
height: 24px;
12751279
width: auto;
12761280
display: block;
12771281
margin-left: 20px;
@@ -1427,7 +1431,7 @@ body:not(.home-page) .footer {
14271431
}
14281432

14291433
.step-progress {
1430-
width: 90%;
1434+
width: 100%;
14311435
margin-left: 18px;
14321436
}
14331437
.footer__title {
Lines changed: 10 additions & 0 deletions
Loading

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/components/Layout.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
44
import LoginModal from '../loginModal/LoginModal';
55
import { ReactComponent as ChevronRightIcon } from '../assets/icons/chevron-right.svg';
66
import { ReactComponent as CrossIcon } from '../assets/icons/cross.svg';
7+
import { ReactComponent as LogoIcon } from '../assets/icons/logo_40х40.svg';
78

89
const resolveApiBase = () => {
910
if (process.env.REACT_APP_API_BASE) {
@@ -89,7 +90,10 @@ export default function Layout() {
8990
}
9091
}, [accountStatus]);
9192

92-
const openLoginModal = () => setIsLoginOpen(true);
93+
const openLoginModal = () => {
94+
setIsNavOpen(false);
95+
setIsLoginOpen(true);
96+
};
9397
const closeLoginModal = () => setIsLoginOpen(false);
9498

9599
const logout = async () => {
@@ -117,11 +121,7 @@ export default function Layout() {
117121
<div className="nav">
118122
<div className="nav__brand">
119123
<Link to="/">
120-
<img
121-
className="nav__logo"
122-
src="/signsphere-logo.png"
123-
alt={t('Layout.SignsphereAlt')}
124-
/>
124+
<LogoIcon className="nav__logo" />
125125
</Link>
126126
</div>
127127
<button className="nav__toggle" type="button" onClick={() => setIsNavOpen(!isNavOpen)}>

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/components/StepProgress.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const StepProgress = ({ steps, currentStep }) => {
4444
);
4545
}
4646
return (
47-
<div className="step-progress">
47+
<div className=" col-lg-9 step-progress">
4848
{steps.map((step, index) => {
4949
const isCompleted = index < currentStep;
5050
const isActive = index === currentStep;

0 commit comments

Comments
 (0)