Skip to content

Commit 41753af

Browse files
author
Josh Habdas
committed
Merge branch 'master' into segment-examples
2 parents 5582082 + d2f047f commit 41753af

File tree

14 files changed

+344
-39
lines changed

14 files changed

+344
-39
lines changed

CHANGELOG.md

Lines changed: 63 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,33 @@
11
# Change Log
22

3-
## [v0.7.1](https://github.com/technologyadvice/stardust/tree/v0.7.1) (2015-10-28)
4-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.7.0...v0.7.1)
3+
## [v0.8.0](https://github.com/TechnologyAdvice/stardust/tree/v0.8.0) (2015-11-24)
4+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.7.1...v0.8.0)
5+
6+
**Implemented enhancements:**
7+
8+
- Add \<Buttons /\> [\#97](https://github.com/TechnologyAdvice/stardust/issues/97)
9+
- A \<Divider /\> element. [\#49](https://github.com/TechnologyAdvice/stardust/issues/49)
10+
- Add offset to Columns [\#26](https://github.com/TechnologyAdvice/stardust/issues/26)
11+
12+
**Closed issues:**
13+
14+
- Add \<Header /\> component [\#107](https://github.com/TechnologyAdvice/stardust/issues/107)
15+
- Duplicate random data causing intermittent Table test fail [\#95](https://github.com/TechnologyAdvice/stardust/issues/95)
16+
- Cleanup redundancy in tests [\#60](https://github.com/TechnologyAdvice/stardust/issues/60)
17+
18+
**Merged pull requests:**
19+
20+
- Add Statistic and Statistics components [\#117](https://github.com/TechnologyAdvice/stardust/pull/117) ([levithomason](https://github.com/levithomason))
21+
- Organize doc menu into groups [\#110](https://github.com/TechnologyAdvice/stardust/pull/110) ([levithomason](https://github.com/levithomason))
22+
- Feature/header component [\#109](https://github.com/TechnologyAdvice/stardust/pull/109) ([kyleturco](https://github.com/kyleturco))
23+
- Update build and deploy [\#108](https://github.com/TechnologyAdvice/stardust/pull/108) ([levithomason](https://github.com/levithomason))
24+
- Feature/buttons component [\#106](https://github.com/TechnologyAdvice/stardust/pull/106) ([kyleturco](https://github.com/kyleturco))
25+
- Feature/divider component [\#103](https://github.com/TechnologyAdvice/stardust/pull/103) ([kyleturco](https://github.com/kyleturco))
26+
- Feature/list examples [\#100](https://github.com/TechnologyAdvice/stardust/pull/100) ([kyleturco](https://github.com/kyleturco))
27+
- Fix test warnings [\#90](https://github.com/TechnologyAdvice/stardust/pull/90) ([levithomason](https://github.com/levithomason))
28+
29+
## [v0.7.1](https://github.com/TechnologyAdvice/stardust/tree/v0.7.1) (2015-10-28)
30+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.7.0...v0.7.1)
531

632
**Implemented enhancements:**
733

@@ -21,8 +47,8 @@
2147
- Fields component and Form examples [\#94](https://github.com/TechnologyAdvice/stardust/pull/94) ([levithomason](https://github.com/levithomason))
2248
- Checkbox plugin [\#80](https://github.com/TechnologyAdvice/stardust/pull/80) ([levithomason](https://github.com/levithomason))
2349

24-
## [v0.7.0](https://github.com/technologyadvice/stardust/tree/v0.7.0) (2015-10-23)
25-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.6.3...v0.7.0)
50+
## [v0.7.0](https://github.com/TechnologyAdvice/stardust/tree/v0.7.0) (2015-10-23)
51+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.6.3...v0.7.0)
2652

2753
**Implemented enhancements:**
2854

@@ -46,26 +72,26 @@
4672
- Remove dist [\#89](https://github.com/TechnologyAdvice/stardust/pull/89) ([levithomason](https://github.com/levithomason))
4773
- add getUnhandledProps util [\#85](https://github.com/TechnologyAdvice/stardust/pull/85) ([levithomason](https://github.com/levithomason))
4874

49-
## [v0.6.3](https://github.com/technologyadvice/stardust/tree/v0.6.3) (2015-10-22)
50-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.6.2...v0.6.3)
75+
## [v0.6.3](https://github.com/TechnologyAdvice/stardust/tree/v0.6.3) (2015-10-22)
76+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.6.2...v0.6.3)
5177

5278
**Merged pull requests:**
5379

5480
- update to react 14 [\#83](https://github.com/TechnologyAdvice/stardust/pull/83) ([levithomason](https://github.com/levithomason))
5581

56-
## [v0.6.2](https://github.com/technologyadvice/stardust/tree/v0.6.2) (2015-10-22)
57-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.6.1...v0.6.2)
82+
## [v0.6.2](https://github.com/TechnologyAdvice/stardust/tree/v0.6.2) (2015-10-22)
83+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.6.1...v0.6.2)
5884

59-
## [v0.6.1](https://github.com/technologyadvice/stardust/tree/v0.6.1) (2015-10-22)
60-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.6.0...v0.6.1)
85+
## [v0.6.1](https://github.com/TechnologyAdvice/stardust/tree/v0.6.1) (2015-10-22)
86+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.6.0...v0.6.1)
6187

6288
**Merged pull requests:**
6389

6490
- Add dist to package [\#82](https://github.com/TechnologyAdvice/stardust/pull/82) ([levithomason](https://github.com/levithomason))
6591
- Build library and docs on deploy [\#81](https://github.com/TechnologyAdvice/stardust/pull/81) ([levithomason](https://github.com/levithomason))
6692

67-
## [v0.6.0](https://github.com/technologyadvice/stardust/tree/v0.6.0) (2015-10-22)
68-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.5.1...v0.6.0)
93+
## [v0.6.0](https://github.com/TechnologyAdvice/stardust/tree/v0.6.0) (2015-10-22)
94+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.5.1...v0.6.0)
6995

7096
**Closed issues:**
7197

@@ -82,8 +108,8 @@
82108
- Feature/add sd item [\#65](https://github.com/TechnologyAdvice/stardust/pull/65) ([athurman](https://github.com/athurman))
83109
- Message component [\#62](https://github.com/TechnologyAdvice/stardust/pull/62) ([levithomason](https://github.com/levithomason))
84110

85-
## [v0.5.1](https://github.com/technologyadvice/stardust/tree/v0.5.1) (2015-10-19)
86-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.5.0...v0.5.1)
111+
## [v0.5.1](https://github.com/TechnologyAdvice/stardust/tree/v0.5.1) (2015-10-19)
112+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.5.0...v0.5.1)
87113

88114
**Implemented enhancements:**
89115

@@ -109,8 +135,8 @@
109135
- add getting started section to readme [\#58](https://github.com/TechnologyAdvice/stardust/pull/58) ([levithomason](https://github.com/levithomason))
110136
- Fix floated examples [\#57](https://github.com/TechnologyAdvice/stardust/pull/57) ([levithomason](https://github.com/levithomason))
111137

112-
## [v0.5.0](https://github.com/technologyadvice/stardust/tree/v0.5.0) (2015-10-16)
113-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.4.0...v0.5.0)
138+
## [v0.5.0](https://github.com/TechnologyAdvice/stardust/tree/v0.5.0) (2015-10-16)
139+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.4.0...v0.5.0)
114140

115141
**Closed issues:**
116142

@@ -126,8 +152,8 @@
126152
- Feature/button examples [\#45](https://github.com/TechnologyAdvice/stardust/pull/45) ([kyleturco](https://github.com/kyleturco))
127153
- Table update [\#44](https://github.com/TechnologyAdvice/stardust/pull/44) ([levithomason](https://github.com/levithomason))
128154

129-
## [v0.4.0](https://github.com/technologyadvice/stardust/tree/v0.4.0) (2015-10-12)
130-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.3.0...v0.4.0)
155+
## [v0.4.0](https://github.com/TechnologyAdvice/stardust/tree/v0.4.0) (2015-10-12)
156+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.3.0...v0.4.0)
131157

132158
**Closed issues:**
133159

@@ -146,8 +172,8 @@
146172
- Menu [\#18](https://github.com/TechnologyAdvice/stardust/pull/18) ([levithomason](https://github.com/levithomason))
147173
- update modal logic [\#11](https://github.com/TechnologyAdvice/stardust/pull/11) ([athurman](https://github.com/athurman))
148174

149-
## [v0.3.0](https://github.com/technologyadvice/stardust/tree/v0.3.0) (2015-10-05)
150-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.2.1...v0.3.0)
175+
## [v0.3.0](https://github.com/TechnologyAdvice/stardust/tree/v0.3.0) (2015-10-05)
176+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.2.1...v0.3.0)
151177

152178
**Merged pull requests:**
153179

@@ -156,11 +182,11 @@
156182
- add container and update docs [\#15](https://github.com/TechnologyAdvice/stardust/pull/15) ([eanplatter](https://github.com/eanplatter))
157183
- Docs link [\#14](https://github.com/TechnologyAdvice/stardust/pull/14) ([levithomason](https://github.com/levithomason))
158184

159-
## [v0.2.1](https://github.com/technologyadvice/stardust/tree/v0.2.1) (2015-10-03)
160-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.2.0...v0.2.1)
185+
## [v0.2.1](https://github.com/TechnologyAdvice/stardust/tree/v0.2.1) (2015-10-03)
186+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.2.0...v0.2.1)
161187

162-
## [v0.2.0](https://github.com/technologyadvice/stardust/tree/v0.2.0) (2015-10-03)
163-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.1.7...v0.2.0)
188+
## [v0.2.0](https://github.com/TechnologyAdvice/stardust/tree/v0.2.0) (2015-10-03)
189+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.1.7...v0.2.0)
164190

165191
**Closed issues:**
166192

@@ -170,25 +196,25 @@
170196

171197
- Field options [\#5](https://github.com/TechnologyAdvice/stardust/pull/5) ([levithomason](https://github.com/levithomason))
172198

173-
## [v0.1.7](https://github.com/technologyadvice/stardust/tree/v0.1.7) (2015-10-03)
174-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.1.6...v0.1.7)
199+
## [v0.1.7](https://github.com/TechnologyAdvice/stardust/tree/v0.1.7) (2015-10-03)
200+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.1.6...v0.1.7)
175201

176-
## [v0.1.6](https://github.com/technologyadvice/stardust/tree/v0.1.6) (2015-10-03)
177-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.1.5...v0.1.6)
202+
## [v0.1.6](https://github.com/TechnologyAdvice/stardust/tree/v0.1.6) (2015-10-03)
203+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.1.5...v0.1.6)
178204

179-
## [v0.1.5](https://github.com/technologyadvice/stardust/tree/v0.1.5) (2015-10-03)
180-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.1.4...v0.1.5)
205+
## [v0.1.5](https://github.com/TechnologyAdvice/stardust/tree/v0.1.5) (2015-10-03)
206+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.1.4...v0.1.5)
181207

182-
## [v0.1.4](https://github.com/technologyadvice/stardust/tree/v0.1.4) (2015-10-03)
183-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.1.3...v0.1.4)
208+
## [v0.1.4](https://github.com/TechnologyAdvice/stardust/tree/v0.1.4) (2015-10-03)
209+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.1.3...v0.1.4)
184210

185-
## [v0.1.3](https://github.com/technologyadvice/stardust/tree/v0.1.3) (2015-10-03)
186-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.1.2...v0.1.3)
211+
## [v0.1.3](https://github.com/TechnologyAdvice/stardust/tree/v0.1.3) (2015-10-03)
212+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.1.2...v0.1.3)
187213

188-
## [v0.1.2](https://github.com/technologyadvice/stardust/tree/v0.1.2) (2015-10-03)
189-
[Full Changelog](https://github.com/technologyadvice/stardust/compare/v0.1.1...v0.1.2)
214+
## [v0.1.2](https://github.com/TechnologyAdvice/stardust/tree/v0.1.2) (2015-10-03)
215+
[Full Changelog](https://github.com/TechnologyAdvice/stardust/compare/v0.1.1...v0.1.2)
190216

191-
## [v0.1.1](https://github.com/technologyadvice/stardust/tree/v0.1.1) (2015-10-03)
217+
## [v0.1.1](https://github.com/TechnologyAdvice/stardust/tree/v0.1.1) (2015-10-03)
192218
**Merged pull requests:**
193219

194220
- add wercker.yml [\#8](https://github.com/TechnologyAdvice/stardust/pull/8) ([levithomason](https://github.com/levithomason))

docs/app/Component Guidelines.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ They usually require a Semantic UI jQuery plugin.
2424
All the appropriate lifecycle work is handled. You can just use the module.
2525

2626
**Settings**
27+
2728
Semantic UI's jQuery plugin settings are exposed as props:
2829

2930
```jsx
@@ -32,6 +33,7 @@ Semantic UI's jQuery plugin settings are exposed as props:
3233
>Settings are applied on componentDidMount.
3334
3435
**Plugin**
36+
3537
Stardust exposes the Semantic UI jQuery plugin as `plugin`. Use it to trigger behaviors:
3638

3739
```jsx
@@ -42,6 +44,7 @@ this.refs.checkbox.plugin('is checked'); // get the state
4244
```
4345

4446
**Element**
47+
4548
Stardust components expose the jQuery element as `element`:
4649

4750
```jsx
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import React, {Component} from 'react';
2+
import StatisticTypesExamples from './Types/StatisticTypesExamples';
3+
4+
export default class StatisticExamples extends Component {
5+
render() {
6+
return (
7+
<div>
8+
<StatisticTypesExamples />
9+
</div>
10+
);
11+
}
12+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import React, {Component} from 'react';
2+
import {Statistic} from 'stardust';
3+
4+
export default class StatisticBottomLabelExample extends Component {
5+
render() {
6+
return (
7+
<Statistic>
8+
<Statistic.Label>5,550</Statistic.Label>
9+
<Statistic.Value>Downloads</Statistic.Value>
10+
</Statistic>
11+
);
12+
}
13+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React, {Component} from 'react';
2+
import {Statistic} from 'stardust';
3+
const {Statistics, Label, Value} = Statistic;
4+
5+
export default class StatisticGroupExample extends Component {
6+
render() {
7+
return (
8+
<Statistics>
9+
<Statistic>
10+
<Value>22</Value>
11+
<Label>Faves</Label>
12+
</Statistic>
13+
<Statistic>
14+
<Value>31,200</Value>
15+
<Label>Views</Label>
16+
</Statistic>
17+
<Statistic>
18+
<Value>22</Value>
19+
<Label>Members</Label>
20+
</Statistic>
21+
</Statistics>
22+
);
23+
}
24+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import React, {Component} from 'react';
2+
import {Statistic} from 'stardust';
3+
4+
export default class StatisticTopLabelExample extends Component {
5+
render() {
6+
return (
7+
<Statistic>
8+
<Statistic.Label>Views</Statistic.Label>
9+
<Statistic.Value>40,509</Statistic.Value>
10+
</Statistic>
11+
);
12+
}
13+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import React, {Component} from 'react';
2+
import ComponentExample from 'docs/app/Components/ComponentDoc/ComponentExample';
3+
import ExampleSection from 'docs/app/Components/ComponentDoc/ExampleSection';
4+
5+
export default class StatisticTypesExamples extends Component {
6+
render() {
7+
return (
8+
<ExampleSection title='Types'>
9+
<ComponentExample
10+
title='Statistic'
11+
description='A statistic can display a value with a label above or below it.'
12+
examplePath='views/Statistic/Types/StatisticBottomLabelExample'
13+
/>
14+
<ComponentExample
15+
examplePath='views/Statistic/Types/StatisticTopLabelExample'
16+
/>
17+
<ComponentExample
18+
title='Statistic Group'
19+
description='A group of statistics'
20+
examplePath='views/Statistic/Types/StatisticGroupExample'
21+
/>
22+
</ExampleSection>
23+
);
24+
}
25+
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "stardust",
3-
"version": "0.7.1",
3+
"version": "0.8.0",
44
"description": "Semantic UI components for React.",
55
"main": "src/index.js",
66
"files": [
77
"src"
88
],
99
"scripts": {
1010
"clean": "while read line; do rm -rf $line; done < .gitignore",
11-
"deploy": "git push && git push --tags && npm publish",
11+
"deploy": "git push && git push --tags && npm login && npm publish",
1212
"lint": "eslint . --format ./node_modules/eslint-friendly-formatter",
1313
"lint-watch": "watch 'npm run lint' docs gulp src test",
1414
"start": "gulp",

src/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import Dropdown from 'src/modules/Dropdown/Dropdown';
3939
// Views
4040
import Item from 'src/views/Items/Item';
4141
import Items from 'src/views/Items/Items';
42+
import Statistic from 'src/views/Statistic/Statistic';
4243

4344
export default {
4445
// Addons
@@ -82,4 +83,5 @@ export default {
8283
// Views
8384
Item,
8485
Items,
86+
Statistic,
8587
};

src/views/Statistic/Label.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import React, {Component, PropTypes} from 'react';
2+
import classNames from 'classnames';
3+
import getUnhandledProps from 'src/utils/getUnhandledProps';
4+
import META from 'src/utils/Meta';
5+
6+
export default class Label extends Component {
7+
static propTypes = {
8+
children: PropTypes.node.isRequired,
9+
className: PropTypes.string,
10+
};
11+
12+
static _meta = {
13+
library: META.library.semanticUI,
14+
name: 'Label',
15+
type: META.type.view,
16+
parent: 'Statistic',
17+
};
18+
19+
render() {
20+
const classes = classNames(
21+
'sd-statistic-label',
22+
this.props.className,
23+
'label',
24+
);
25+
26+
const props = getUnhandledProps(this);
27+
28+
return (
29+
<div {...props} className={classes}>
30+
{this.props.children}
31+
</div>
32+
);
33+
}
34+
}

0 commit comments

Comments
 (0)