Skip to content

Commit e3dbebd

Browse files
committed
final fixes
1 parent 0a5c059 commit e3dbebd

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

components/Prize/PrizeExamples.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import PrizeItems from './PrizeItems'
33

44
require('./PrizeExamples.scss')
55

6+
7+
68
const prizeItems = {
79
type : 'prize',
810
title : 'Prizes',
@@ -48,7 +50,8 @@ const bonusItems = {
4850
},
4951
{
5052
title : 'Checkin',
51-
subText : '$50 x 5'
53+
subText : '$50',
54+
count: '6'
5255
}
5356
]
5457
}

components/Prize/PrizeExamples.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
background-color: #47474F;
33
padding: 15px;
44
width: 400px;
5+
height: 200px !important;
56
}

components/Prize/PrizeItem.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ $accent: #59A7FF;
1313
height: 20px;
1414
margin-right: 15px;
1515

16-
span {
16+
.subText {
1717
font-family: "Roboto", Arial, Helvetica, sans-serif;
1818
font-size: 13px;
1919
line-height: 15px;
2020
color: $white;
2121
font-weight: 500;
2222
}
23-
.prize-circle{
23+
.tagged-value-bg{
2424
display: inline;
2525
padding: 1px 4px 1px 4px;
2626
min-width: 15px;
@@ -39,37 +39,37 @@ $accent: #59A7FF;
3939

4040
.prize {
4141
.PrizeItem:nth-child(1) {
42-
.prize-circle{
42+
.tagged-value-bg {
4343
background: $gold;
4444
}
4545
}
4646
.PrizeItem:nth-child(2) {
47-
.prize-circle{
47+
.tagged-value-bg {
4848
background: $silver;
4949
}
5050
}
5151

5252
.PrizeItem:nth-child(3) {
53-
.prize-circle{
53+
.tagged-value-bg {
5454
background: $bronze;
5555
}
5656
}
5757
}
5858

5959
.bonus {
6060
.PrizeItem:nth-child(1) {
61-
.prize-circle {
61+
.tagged-value-bg {
6262
background: $purple;
6363
}
6464
}
6565
.PrizeItem:nth-child(2) {
66-
.prize-circle {
66+
.tagged-value-bg {
6767
background: $purple;
6868
}
6969
}
7070

7171
.PrizeItem:nth-child(3) {
72-
.prize-circle {
72+
.tagged-value-bg {
7373
background: $accent;
7474
}
7575
}

components/Prize/PrizeItems.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import classNames from 'classnames'
3-
import PrizeItem from './PrizeItem'
3+
import TaggedValue from '../TaggedValue/TaggedValue'
44

55
require('./PrizeItem.scss')
66

@@ -15,14 +15,14 @@ const PrizeItems = ({type, title, items}) => {
1515
<div className="title">{title}</div>
1616
<div className={itemsClass}>
1717
{items.map((item, index) => {
18-
return <PrizeItem title={item.title} subText={item.subText} key={index}/>
18+
return <TaggedValue title={item.title} subText={item.subText} count={item.count} style="PrizeItem" key={index}/>
1919
})}
2020
</div>
2121
</div>
2222
)
2323
}
2424

25-
PrizeItem.propTypes = {
25+
PrizeItems.propTypes = {
2626
type : React.PropTypes.string,
2727
items : React.PropTypes.array
2828
}

0 commit comments

Comments
 (0)