Skip to content

Commit

Permalink
Merge pull request #225 from primer/release-8.0.0
Browse files Browse the repository at this point in the history
Release v8.0.0
  • Loading branch information
Emily authored Jul 13, 2018
2 parents 2cca74e + 0ca28e6 commit 1d6acdb
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 30 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"lib/octicons_jekyll",
"lib/octicons_react"
],
"version": "7.4.0"
"version": "8.0.0"
}
2 changes: 1 addition & 1 deletion lib/octicons_gem/lib/octicons/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Octicons
VERSION = "7.4.0".freeze
VERSION = "8.0.0".freeze
end
2 changes: 1 addition & 1 deletion lib/octicons_gem/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "octicons_gem",
"version": "7.4.0",
"version": "8.0.0",
"description": "Don't install",
"scripts": {
"postinstall": "bundle install --path vendor/bundle",
Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_helper/lib/octicons_helper/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module OcticonsHelper
VERSION = "7.4.0".freeze
VERSION = "8.0.0".freeze
end
2 changes: 1 addition & 1 deletion lib/octicons_helper/octicons_helper.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ Gem::Specification.new do |s|

s.require_paths = ["lib"]

s.add_dependency "octicons", "7.4.0"
s.add_dependency "octicons", "8.0.0"
s.add_dependency "rails"
end
4 changes: 2 additions & 2 deletions lib/octicons_helper/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "octicons_helper",
"version": "7.4.0",
"version": "8.0.0",
"description": "A rails helper that makes including svg Octicons simple.",
"scripts": {
"version": "../../script/rubyversion ./lib/octicons_helper/version.rb",
Expand All @@ -21,6 +21,6 @@
"rubygems": "octicons_helper",
"homepage": "https://github.com/primer/octicons#readme",
"dependencies": {
"octicons_gem": "7.4.0"
"octicons_gem": "8.0.0"
}
}
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/jekyll-octicons.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]

s.add_dependency "jekyll", "~> 3.1"
s.add_dependency "octicons", "7.4.0"
s.add_dependency "octicons", "8.0.0"
end
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/lib/jekyll-octicons/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module Liquid; class Tag; end; end

module Jekyll
class Octicons < Liquid::Tag
VERSION = "7.4.0".freeze
VERSION = "8.0.0".freeze
end
end
4 changes: 2 additions & 2 deletions lib/octicons_jekyll/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jekyll-octicons",
"version": "7.4.0",
"version": "8.0.0",
"description": "A jekyll liquid plugin that makes including svg Octicons simple.",
"scripts": {
"version": "../../script/rubyversion ./lib/jekyll-octicons/version.rb",
Expand All @@ -21,6 +21,6 @@
"rubygems": "jekyll-octicons",
"homepage": "https://github.com/primer/octicons#readme",
"dependencies": {
"octicons_gem": "7.4.0"
"octicons_gem": "8.0.0"
}
}
2 changes: 1 addition & 1 deletion lib/octicons_node/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "7.4.0",
"version": "8.0.0",
"name": "octicons",
"description": "A scalable set of icons handcrafted with <3 by GitHub.",
"homepage": "https://octicons.github.com",
Expand Down
24 changes: 11 additions & 13 deletions lib/octicons_react/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# GitHub Octicons React Component
# [Octicons] for React

[![npm version](https://img.shields.io/npm/v/%40github%2Focticons-react.svg)](https://www.npmjs.org/package/%40github%2Focticons-react)
[![npm version](https://img.shields.io/npm/v/@githubprimer/octicons-react.svg)](https://www.npmjs.org/package/@githubprimer/octicons-react)
[![Build Status](https://travis-ci.org/primer/octicons.svg?branch=master)](https://travis-ci.org/primer/octicons)

> [Octicons] for React
## Install

```
$ npm install @github/octicons-react --save
$ npm install @githubprimer/octicons-react --save
```

## Usage
Expand All @@ -34,15 +32,15 @@ Note that none of our builtin icons take props, so unless you're creating
[custom icons](#custom-icons) you'll probably want to use the `icon` prop form.

### Icons
The `@github/octicons-react` module exports the `Octicon` component as
The `@githubprimer/octicons-react` module exports the `Octicon` component as
`default` and the individual icon symbols as separate [named
exports](https://ponyfoo.com/articles/es6-modules-in-depth#named-exports). This
allows you to import only the icons that you need without blowing up your
bundle:

```jsx
import React from 'react'
import Octicon, {Beaker, Zap} from '@github/octicons-react'
import Octicon, {Beaker, Zap} from '@githubprimer/octicons-react'

export default function Icon({boom}) {
return <Octicon icon={boom ? Zap : Beaker}/>
Expand All @@ -66,7 +64,7 @@ resolves it to the right component:

```jsx
import React from 'react'
import Octicon, {getIconByName} from '@github/octicons-react'
import Octicon, {getIconByName} from '@githubprimer/octicons-react'

export default function OcticonByName({name, ...props}) {
return <Octicon {...props} icon={getIcon(name)} />
Expand All @@ -80,7 +78,7 @@ the octicons:

```jsx
import React from 'react'
import Octicon, {iconsByName} from '@github/octicons-react'
import Octicon, {iconsByName} from '@githubprimer/octicons-react'

export default function OcticonsList() {
return (
Expand All @@ -102,7 +100,7 @@ styles. You can change the alignment via the `verticalAlign` prop, which can be
either `middle`, `text-bottom`, `text-top`, or `top`.

```js
import Octicon, {Repo} from '@github/octicons-react'
import Octicon, {Repo} from '@githubprimer/octicons-react'

export default () => (
<h1>
Expand All @@ -119,7 +117,7 @@ capitalization of `L`!).

```js
// Example usage
import Octicon, {Plus} from '@github/octicons-react'
import Octicon, {Plus} from '@githubprimer/octicons-react'

export default () => (
<button>
Expand All @@ -141,7 +139,7 @@ render octicons at standard sizes:

```js
// Example usage
import Octicon, {LogoGithub} from '@github/octicons-react'
import Octicon, {LogoGithub} from '@githubprimer/octicons-react'

export default () => (
<h1>
Expand All @@ -162,7 +160,7 @@ custom icon that consisted of three circles side by side, you could do this:

```jsx
import React from 'react'
import Octicon from '@github/octicons-react'
import Octicon from '@githubprimer/octicons-react'

function CirclesIcon() {
return (
Expand Down
4 changes: 2 additions & 2 deletions lib/octicons_react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@github/octicons-react",
"version": "7.4.0",
"name": "@githubprimer/octicons-react",
"version": "8.0.0",
"description": "A scalable set of icons handcrafted with <3 by GitHub.",
"homepage": "https://octicons.github.com",
"author": "GitHub, Inc.",
Expand Down
6 changes: 3 additions & 3 deletions lib/octicons_react/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'

import Octicon, {iconsByName} from '../'
import {Block, Text} from 'primer-react'
import pkg from '../package.json'
import Octicon, {iconsByName} from '../'

export default function App() {
const sizes = ['small', 'medium', 'large']
Expand Down Expand Up @@ -41,7 +41,7 @@ export default function App() {
<td>
<pre>
{`
import Octicon, {${Icon.name}} from '@github/octicons-react'
import Octicon, {${Icon.name}} from '${pkg.name}'
export default () => <Octicon icon={${Icon.name}} />
`.trim()}
</pre>
Expand Down

0 comments on commit 1d6acdb

Please sign in to comment.