Skip to content
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.

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

Add "text" octicons for bold, italic and text-size #147

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ logs
# Build
dist
.publish
lib
# lib

# Dependencies
node_modules
Expand Down
15 changes: 10 additions & 5 deletions less/base/octicons.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@octicons-font-path: "https://cdnjs.cloudflare.com/ajax/libs/octicons/3.1.0";
@octicons-version: "396334ee3da78f4302d25c758ae3e3ce5dc3c97d";
@octicons-font-path: ".";
@octicons-version: "c5a1d52cb40008f6d4ed65bf3f12d508b2fe8c88";

@font-face {
font-family: 'octicons';
Expand Down Expand Up @@ -39,6 +39,7 @@
.octicon-microscope:before,
.octicon-beaker:before { content: '\f0dd'} /*  */
.octicon-bell:before { content: '\f0de'} /*  */
.octicon-bold:before { content: '\f0e2'} /*  */
.octicon-book:before { content: '\f007'} /*  */
.octicon-bookmark:before { content: '\f07b'} /*  */
.octicon-briefcase:before { content: '\f0d3'} /*  */
Expand All @@ -59,7 +60,6 @@
.octicon-cloud-download:before { content: '\f00b'} /*  */
.octicon-cloud-upload:before { content: '\f00c'} /*  */
.octicon-code:before { content: '\f05f'} /*  */
.octicon-color-mode:before { content: '\f065'} /*  */
.octicon-comment-add:before,
.octicon-comment:before { content: '\f02b'} /*  */
.octicon-comment-discussion:before { content: '\f04f'} /*  */
Expand Down Expand Up @@ -119,6 +119,7 @@
.octicon-issue-closed:before { content: '\f028'} /*  */
.octicon-issue-opened:before { content: '\f026'} /*  */
.octicon-issue-reopened:before { content: '\f027'} /*  */
.octicon-italic:before { content: '\f0e4'} /*  */
.octicon-jersey:before { content: '\f019'} /*  */
.octicon-key:before { content: '\f049'} /*  */
.octicon-keyboard:before { content: '\f00d'} /*  */
Expand All @@ -133,6 +134,7 @@
.octicon-mirror-private:before,
.octicon-git-fork-private:before,
.octicon-lock:before { content: '\f06a'} /*  */
.octicon-logo-gist:before { content: '\f0ad'} /*  */
.octicon-logo-github:before { content: '\f092'} /*  */
.octicon-mail:before { content: '\f03b'} /*  */
.octicon-mail-read:before { content: '\f03c'} /*  */
Expand Down Expand Up @@ -179,8 +181,6 @@
.octicon-rocket:before { content: '\f033'} /*  */
.octicon-rss:before { content: '\f034'} /*  */
.octicon-ruby:before { content: '\f047'} /*  */
.octicon-screen-full:before { content: '\f066'} /*  */
.octicon-screen-normal:before { content: '\f067'} /*  */
.octicon-search-save:before,
.octicon-search:before { content: '\f02e'} /*  */
.octicon-server:before { content: '\f097'} /*  */
Expand All @@ -190,6 +190,7 @@
.octicon-sign-in:before { content: '\f036'} /*  */
.octicon-log-out:before,
.octicon-sign-out:before { content: '\f032'} /*  */
.octicon-smiley:before { content: '\f0e7'} /*  */
.octicon-squirrel:before { content: '\f0b2'} /*  */
.octicon-star-add:before,
.octicon-star-delete:before,
Expand All @@ -200,8 +201,10 @@
.octicon-tag-remove:before,
.octicon-tag-add:before,
.octicon-tag:before { content: '\f015'} /*  */
.octicon-tasklist:before { content: '\f0e5'} /*  */
.octicon-telescope:before { content: '\f088'} /*  */
.octicon-terminal:before { content: '\f0c8'} /*  */
.octicon-text-size:before { content: '\f0e3'} /*  */
.octicon-three-bars:before { content: '\f05e'} /*  */
.octicon-thumbsdown:before { content: '\f0db'} /*  */
.octicon-thumbsup:before { content: '\f0da'} /*  */
Expand All @@ -213,6 +216,8 @@
.octicon-triangle-up:before { content: '\f0aa'} /*  */
.octicon-unfold:before { content: '\f039'} /*  */
.octicon-unmute:before { content: '\f0ba'} /*  */
.octicon-unverified:before { content: '\f0e8'} /*  */
.octicon-verified:before { content: '\f0e6'} /*  */
.octicon-versions:before { content: '\f064'} /*  */
.octicon-watch:before { content: '\f0e0'} /*  */
.octicon-remove-close:before,
Expand Down
40 changes: 40 additions & 0 deletions lib/Elemental.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
'use strict';

exports.Alert = require('./components/Alert');
exports.BlankState = require('./components/BlankState');
exports.Button = require('./components/Button');
exports.ButtonGroup = require('./components/ButtonGroup');
exports.Checkbox = require('./components/Checkbox');
exports.Card = require('./components/Card');
exports.Col = require('./components/Col');
exports.Container = require('./components/Container');
exports.Dropdown = require('./components/Dropdown');
exports.EmailInputGroup = require('./components/EmailInputGroup');
exports.FileDragAndDrop = require('./components/FileDragAndDrop');
exports.FileUpload = require('./components/FileUpload');
exports.Form = require('./components/Form');
exports.FormField = require('./components/FormField');
exports.FormIcon = require('./components/FormIcon');
exports.FormIconField = require('./components/FormIconField');
exports.FormInput = require('./components/FormInput');
exports.FormLabel = require('./components/FormLabel');
exports.FormNote = require('./components/FormNote');
exports.FormRow = require('./components/FormRow');
exports.FormSelect = require('./components/FormSelect');
exports.Glyph = require('./components/Glyph');
exports.InputGroup = require('./components/InputGroup');
exports.InputGroupSection = require('./components/InputGroupSection');
exports.Modal = require('./components/Modal');
exports.ModalBody = require('./components/ModalBody');
exports.ModalFooter = require('./components/ModalFooter');
exports.ModalHeader = require('./components/ModalHeader');
exports.Pagination = require('./components/Pagination');
exports.PasswordInputGroup = require('./components/PasswordInputGroup');
exports.Pill = require('./components/Pill');
exports.Radio = require('./components/Radio');
exports.ResponsiveText = require('./components/ResponsiveText');
exports.Row = require('./components/Row');
exports.RadioGroup = require('./components/RadioGroup');
exports.SegmentedControl = require('./components/SegmentedControl');
exports.Spinner = require('./components/Spinner');
exports.Table = require('./components/Table');
19 changes: 19 additions & 0 deletions lib/Octicons.js

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions lib/components/Alert.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'use strict';

var React = require('react');
var classNames = require('classnames');

var ALERT_TYPES = ['danger', 'error', // alias for danger
'info', 'primary', 'success', 'warning'];

module.exports = React.createClass({
displayName: 'ElementalAlert',
propTypes: {
children: React.PropTypes.node.isRequired,
className: React.PropTypes.string,
type: React.PropTypes.oneOf(ALERT_TYPES).isRequired
},
render: function render() {
var componentClass = classNames('Alert', 'Alert--' + this.props.type, this.props.className);

return React.createElement(
'div',
{ className: componentClass },
this.props.children
);
}
});
25 changes: 25 additions & 0 deletions lib/components/BlankState.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'use strict';

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

var React = require('react');

module.exports = React.createClass({
displayName: 'BlankState',
propTypes: {
children: React.PropTypes.node.isRequired
},
render: function render() {
return React.createElement('div', _extends({ className: 'BlankState' }, this.props));
}
});

module.exports.Heading = React.createClass({
displayName: 'BlankStateHeading',
propTypes: {
children: React.PropTypes.node.isRequired
},
render: function render() {
return React.createElement('h2', _extends({ className: 'BlankState__heading' }, this.props));
}
});
53 changes: 53 additions & 0 deletions lib/components/Button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
'use strict';

var React = require('react');
var classNames = require('classnames');
var blacklist = require('blacklist');

var BUTTON_SIZES = ['lg', 'sm', 'xs'];

var BUTTON_TYPES = ['default', 'default-primary', 'default-success', 'default-warning', 'default-danger', 'hollow-primary', 'hollow-success', 'hollow-warning', 'hollow-danger', 'primary', 'success', 'warning', 'danger', 'link', 'link-text', 'link-primary', 'link-success', 'link-warning', 'link-danger', 'link-cancel', 'link-delete'];

module.exports = React.createClass({
displayName: 'Button',
propTypes: {
block: React.PropTypes.bool,
className: React.PropTypes.string,
component: React.PropTypes.element,
href: React.PropTypes.string,
isActive: React.PropTypes.bool,
size: React.PropTypes.oneOf(BUTTON_SIZES),
submit: React.PropTypes.bool,
type: React.PropTypes.oneOf(BUTTON_TYPES)
},
getDefaultProps: function getDefaultProps() {
return {
type: 'default'
};
},
render: function render() {
// classes
var componentClass = classNames('Button', 'Button--' + this.props.type, this.props.size ? 'Button--' + this.props.size : null, {
'Button--block': this.props.block,
'is-active': this.props.isActive
}, this.props.className);

// props
var props = blacklist(this.props, 'type', 'size', 'component', 'className');
props.className = componentClass;

if (this.props.component) {
return React.cloneElement(this.props.component, props);
}

var tag = 'button';
props.type = this.props.submit ? 'submit' : 'button';

if (props.href) {
tag = 'a';
delete props.type;
}

return React.createElement(tag, props, this.props.children);
}
});
18 changes: 18 additions & 0 deletions lib/components/ButtonGroup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

var classnames = require('classnames');
var React = require('react');

module.exports = React.createClass({
displayName: 'ButtonGroup',
propTypes: {
children: React.PropTypes.node.isRequired,
className: React.PropTypes.string
},
render: function render() {
var className = classnames('ButtonGroup', this.props.className);
return React.createElement('div', _extends({}, this.props, { className: className }));
}
});
19 changes: 19 additions & 0 deletions lib/components/Card.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
'use strict';

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

var React = require('react');
var classNames = require('classnames');

module.exports = React.createClass({
displayName: 'Card',
propTypes: {
children: React.PropTypes.node.isRequired,
className: React.PropTypes.string
},
render: function render() {
var className = classNames('Card', this.props.className);

return React.createElement('div', _extends({}, this.props, { className: className }));
}
});
53 changes: 53 additions & 0 deletions lib/components/Checkbox.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
'use strict';

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

var blacklist = require('blacklist');
var classNames = require('classnames');
var React = require('react');

var Checkbox = React.createClass({
displayName: 'Checkbox',

propTypes: {
autofocus: React.PropTypes.bool,
className: React.PropTypes.string,
disabled: React.PropTypes.bool,
indeterminate: React.PropTypes.bool,
inline: React.PropTypes.bool,
label: React.PropTypes.string,
style: React.PropTypes.object,
title: React.PropTypes.string
},
componentDidMount: function componentDidMount() {
if (this.props.autofocus) {
this.refs.target.focus();
}
this.setIndeterminate(this.props.indeterminate);
},
componentWillReceiveProps: function componentWillReceiveProps(nextProps) {
this.setIndeterminate(nextProps.indeterminate);
},
setIndeterminate: function setIndeterminate(value) {
this.refs.target.indeterminate = value;
},
render: function render() {
var componentClass = classNames('Checkbox', {
'Checkbox--disabled': this.props.disabled,
'Checkbox--inline': this.props.inline
}, this.props.className);
var props = blacklist(this.props, 'className', 'label', 'style', 'title');
return React.createElement(
'label',
{ className: componentClass, style: this.props.style, title: this.props.title },
React.createElement('input', _extends({ ref: 'target', type: 'checkbox', className: 'Checkbox__input' }, props)),
this.props.label && React.createElement(
'span',
{ className: 'Checkbox__label' },
this.props.label
)
);
}
});

module.exports = Checkbox;
Loading