Skip to content

final fixes #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 2 commits into from
Apr 11, 2016
Merged

final fixes #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3dbebd
final fixes
amolskh Apr 8, 2016
7d9f507
Using TaggedValueList component
amolskh Apr 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion components/Prize/PrizeExamples.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import PrizeItems from './PrizeItems'

require('./PrizeExamples.scss')



const prizeItems = {
type : 'prize',
title : 'Prizes',
Expand Down Expand Up @@ -48,7 +50,8 @@ const bonusItems = {
},
{
title : 'Checkin',
subText : '$50 x 5'
subText : '$50',
count: '6'
}
]
}
Expand Down
1 change: 1 addition & 0 deletions components/Prize/PrizeExamples.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
background-color: #47474F;
padding: 15px;
width: 400px;
height: 200px !important;
}
18 changes: 0 additions & 18 deletions components/Prize/PrizeItem.jsx
View file
Open in desktop

This file was deleted.

30 changes: 15 additions & 15 deletions components/Prize/PrizeItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ $gray: #47474F;
$purple: #B47DD6;
$accent: #59A7FF;

.PrizeItem {
.TaggedValue {
display:inline-block;
height: 20px;
margin-right: 15px;

span {
.subText {
font-family: "Roboto", Arial, Helvetica, sans-serif;
font-size: 13px;
line-height: 15px;
color: $white;
font-weight: 500;
}
.prize-circle{
.tagged-value-bg{
display: inline;
padding: 1px 4px 1px 4px;
min-width: 15px;
Expand All @@ -38,38 +38,38 @@ $accent: #59A7FF;
}

.prize {
.PrizeItem:nth-child(1) {
.prize-circle{
.TaggedValue:nth-child(1) {
.tagged-value-bg {
background: $gold;
}
}
.PrizeItem:nth-child(2) {
.prize-circle{
.TaggedValue:nth-child(2) {
.tagged-value-bg {
background: $silver;
}
}

.PrizeItem:nth-child(3) {
.prize-circle{
.TaggedValue:nth-child(3) {
.tagged-value-bg {
background: $bronze;
}
}
}

.bonus {
.PrizeItem:nth-child(1) {
.prize-circle {
.TaggedValue:nth-child(1) {
.tagged-value-bg {
background: $purple;
}
}
.PrizeItem:nth-child(2) {
.prize-circle {
.TaggedValue:nth-child(2) {
.tagged-value-bg {
background: $purple;
}
}

.PrizeItem:nth-child(3) {
.prize-circle {
.TaggedValue:nth-child(3) {
.tagged-value-bg {
background: $accent;
}
}
Expand Down
8 changes: 3 additions & 5 deletions components/Prize/PrizeItems.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import classNames from 'classnames'
import PrizeItem from './PrizeItem'
import TaggedValueList from '../TaggedValue/TaggedValueList'

require('./PrizeItem.scss')

Expand All @@ -14,15 +14,13 @@ const PrizeItems = ({type, title, items}) => {
<div className="PrizeItems">
<div className="title">{title}</div>
<div className={itemsClass}>
{items.map((item, index) => {
return <PrizeItem title={item.title} subText={item.subText} key={index}/>
})}
<TaggedValueList items={items} layout="wrap"/>
</div>
</div>
)
}

PrizeItem.propTypes = {
PrizeItems.propTypes = {
type : React.PropTypes.string,
items : React.PropTypes.array
}
Expand Down