Skip to content

Commit 50944e1

Browse files
committed
improvement(reskin): submission detail - part 2 f2f
1 parent c5bf2f3 commit 50944e1

File tree

7 files changed

+269
-240
lines changed

7 files changed

+269
-240
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
@import "~styles/mixins";
2+
13
.nav-header-wrapper {
24
z-index: 2;
35
}
6+
7+
@include xs-to-sm {
8+
margin: auto;
9+
flex-direction: column;
10+
}

src/shared/components/challenge-detail/Checkpoints/styles.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ $tc-gray-border: #aaaab5;
123123
}
124124

125125
.feedback-text {
126-
@include xs-to-sm {
127-
display: none;
128-
}
126+
@include xs-to-sm;
129127
}
130128
}
131129

src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import TimeIconActive from 'assets/images/icon-time-active.svg';
1313
import './style.scss';
1414

1515
/* Date/time format to use in the card. */
16-
const FORMAT = 'MMM DD';
17-
const FORMAT_YEAR = 'MMM DD YYYY';
16+
const FORMAT_YEAR = 'MMM DD, YYYY';
1817
const TIME = 'HH:mm';
1918

2019
export default function Card({ past, time, title }) {
@@ -27,13 +26,13 @@ export default function Card({ past, time, title }) {
2726
</p>
2827
<div>
2928
<p styleName="date">
30-
{ past ? <CalendarIcon /> : <CalendarIconActive /> }
29+
{ past2 ? <CalendarIcon /> : <CalendarIconActive /> }
3130
<span>
32-
{time2.format(time2.year() !== moment().year() ? FORMAT_YEAR : FORMAT)}
31+
{time2.format(FORMAT_YEAR)}
3332
</span>
3433
</p>
3534
<p styleName="time">
36-
{ past ? <TimeIcon /> : <TimeIconActive /> }
35+
{ past2 ? <TimeIcon /> : <TimeIconActive /> }
3736
<span>
3837
{time2.format(TIME)}
3938
</span>

src/shared/components/challenge-detail/Header/DeadlinesPanel/style.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
@include xs-to-md {
1212
flex-direction: column;
13+
padding-top: 0;
1314
padding-right: 16px;
1415
padding-left: 16px;
1516
}

src/shared/components/challenge-detail/Header/TabSelector/index.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,8 @@ export default function ChallengeViewSelector(props) {
167167
onKeyPress={(e) => { handleSelectorClicked(e, DETAIL_TABS.CHECKPOINTS); }}
168168
styleName={getSelectorStyle(selectedView, DETAIL_TABS.CHECKPOINTS)}
169169
>
170-
CHECKPOINTS (
171-
{checkpointCount}
172-
)
170+
CHECKPOINTS
171+
<span styleName="num">{checkpointCount}</span>
173172
</a>
174173
)
175174
}

0 commit comments

Comments
 (0)