Merge branch 'PBI-6-Ray' into 'staging'

Pbi 6 ray

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-web!94

src/page/program/DetailProgram.jsx

@@ -400,7 +400,7 @@ const DetailProgram = ({ idProgram }) => {
             {progress.length > 0 ?
             <div>
               {progress.map ( p => 
-                <div key={p.id} css={css `margin-top: 1rem; font-size: 18px`}>
+                <div key={p.id} css={css `margin-top: 1rem; margin-bottom: 2rem; font-size: 18px`}>
                   <p data-testid="progress-date">{p.date}</p>
                   <p>{p.description}</p>
                   {p.image !== null &&