Skip to content

Commit

Permalink
Merge pull request #73 from iCHEF/feature/zhusee_add_icons
Browse files Browse the repository at this point in the history
Add menu page icons
  • Loading branch information
zhusee2 authored Aug 9, 2017
2 parents dd3c9c8 + 8b025b7 commit 3e475e0
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Add `escapable()` mixin, listening `Esc` key to trigger `onEscape` prop.
- Add page overlay component, `<Overlay>`.
- Add `<Popup>` component.
- Add 3 new icons for menu page purpose.

### Changed
- Improved tests coverage. (especially mixins & utils)
Expand Down
2 changes: 1 addition & 1 deletion configs/fontello.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -694,4 +694,4 @@
]
}
]
}
}
15 changes: 15 additions & 0 deletions examples/Icon/MenuPageIcons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';

import Icon from 'src/Icon';

function MenuPageIconsSet() {
return (
<div>
<Icon type="add-item" />
<Icon type="add-multi-items" />
<Icon type="clear-item" />
</div>
);
}

export default MenuPageIconsSet;
2 changes: 2 additions & 0 deletions examples/Icon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import BasicIconsSet from './BasicIcons';
import PaymentIconsSet from './PaymentIcons';
import CRMIconsSet from './CRMIcons';
import InventoryIconsSet from './InventoryIcons';
import MenuPageIconsSet from './MenuPageIcons';

import LargeIconExample from './LargeIcon';
import IconColorsExample from './IconColors';
Expand All @@ -17,6 +18,7 @@ storiesOf('Icon', module)
.addWithInfo('payment icons set', PaymentIconsSet)
.addWithInfo('CRM icons set', CRMIconsSet)
.addWithInfo('Inventory icons set', InventoryIconsSet)
.addWithInfo('Menu page icons set', MenuPageIconsSet)
.addWithInfo('large size', LargeIconExample)
.addWithInfo('color options', IconColorsExample)
// Props table
Expand Down
Binary file modified src/fonts/gyp-icon.eot
Binary file not shown.
6 changes: 6 additions & 0 deletions src/fonts/gyp-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/fonts/gyp-icon.ttf
Binary file not shown.
Binary file modified src/fonts/gyp-icon.woff
Binary file not shown.
Binary file modified src/fonts/gyp-icon.woff2
Binary file not shown.
10 changes: 9 additions & 1 deletion src/styles/Icon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -246,5 +246,13 @@
.#{$prefix}-icon-download:before {
content: '\e860'; /* '' */
}

.#{$prefix}-icon-add-item:before {
content: '\e832'; /* '' */
}
.#{$prefix}-icon-add-multi-items:before {
content: '\e82f'; /* '' */
}
.#{$prefix}-icon-clear-item:before {
content: '\e830'; /* '' */
}
/* stylelint-enable */

0 comments on commit 3e475e0

Please sign in to comment.