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

fix(CIcon): fix class order and incorrect class name, update docs #300

Closed
wants to merge 1 commit into from
Closed
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
13 changes: 13 additions & 0 deletions packages/coreui-icons-react/README.md
Original file line number Diff line number Diff line change
@@ -74,6 +74,19 @@ render() {
...
```

## Stylesheets

### Using `@coreui/icons-react` with `@coreui/react`

Styles for icon included in `@coreui/react`, see [instructions](https://coreui.io/react/docs/getting-started/introduction/#stylesheets)

### Using only `@coreui/icons-react`

Import css in your app's entry file:

```jsx
import '@coreui/icons-react/dist/index.css';
```

## API

24 changes: 12 additions & 12 deletions packages/coreui-icons-react/src/CIcon.css
Original file line number Diff line number Diff line change
@@ -5,73 +5,73 @@
fill: currentColor;
}

.icon:not(.icon-c-s):not(.icon-custom-size) {
.icon:not(.icon-custom):not(.icon-custom-size) {
width: 1rem;
height: 1rem;
font-size: 1rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-xxl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-xxl {
width: 2rem;
height: 2rem;
font-size: 2rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-3xl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-3xl {
width: 3rem;
height: 3rem;
font-size: 3rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-4xl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-4xl {
width: 4rem;
height: 4rem;
font-size: 4rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-5xl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-5xl {
width: 5rem;
height: 5rem;
font-size: 5rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-6xl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-6xl {
width: 6rem;
height: 6rem;
font-size: 6rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-7xl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-7xl {
width: 7rem;
height: 7rem;
font-size: 7rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-8xl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-8xl {
width: 8rem;
height: 8rem;
font-size: 8rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-9xl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-9xl {
width: 9rem;
height: 9rem;
font-size: 9rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-xl {
.icon:not(.icon-custom):not(.icon-custom-size).icon-xl {
width: 1.5rem;
height: 1.5rem;
font-size: 1.5rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-lg {
.icon:not(.icon-custom):not(.icon-custom-size).icon-lg {
width: 1.25rem;
height: 1.25rem;
font-size: 1.25rem;
}

.icon:not(.icon-c-s):not(.icon-custom-size).icon-sm {
.icon:not(.icon-custom):not(.icon-custom-size).icon-sm {
width: 0.875rem;
height: 0.875rem;
font-size: 0.875rem;
10 changes: 3 additions & 7 deletions packages/coreui-icons-react/src/CIcon.tsx
Original file line number Diff line number Diff line change
@@ -119,13 +119,9 @@ export const CIcon = forwardRef<SVGSVGElement, CIconProps>(
return Array.isArray(code) ? code[1] || code[0] : code
}, [change])

const scale = (() => {
return Array.isArray(code) && code.length > 1 ? code[0] : '64 64'
})()
const scale = Array.isArray(code) && code.length > 1 ? code[0] : '64 64'

const viewBox = (() => {
return rest['viewBox'] || `0 0 ${scale}`
})()
const viewBox = rest['viewBox'] || `0 0 ${scale}`

// render

@@ -134,8 +130,8 @@ export const CIcon = forwardRef<SVGSVGElement, CIconProps>(
: classNames(
'icon',
{
[`icon-${size}`]: size,
[`icon-custom-size`]: height || width,
[`icon-${size}`]: size,
},
className,
)