Skip to content

Commit

Permalink
Merge pull request #39 from certego/develop
Browse files Browse the repository at this point in the history
0.1.3
  • Loading branch information
mlodic authored Sep 15, 2022
2 parents 327fb3d + c295865 commit fdd636d
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 41 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

**[Get it on npm](https://www.npmjs.com/package/certego-ui)**

## [v0.1.3](https://github.com/certego/certego-ui/releases/tag/v0.1.3)
Trying to fix error with new Bootstrap version and custom code to fix a bug

## [v0.1.2](https://github.com/certego/certego-ui/releases/tag/v0.1.2)
Added extraNavComponent support in RouterTabs.

Expand Down
2 changes: 1 addition & 1 deletion example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion example/src/layouts/AppFooter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { FaTwitter } from "react-icons/fa";
import { Toaster, ScrollToTopButton, useToastr } from "@certego/certego-ui";

// constants
const CERTEGO_UI_VERSION = "v0.1.2";
const CERTEGO_UI_VERSION = "v0.1.3";
const selector = (state) => state.toasts;

function AppFooter() {
Expand Down
70 changes: 38 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@certego/certego-ui",
"version": "0.1.2",
"version": "0.1.3",
"description": "certego components library (react.js, reactstrap, etc)",
"author": "certego",
"license": "MIT",
Expand Down Expand Up @@ -44,7 +44,7 @@
"peerDependencies": {
"axios": "^0.27.2",
"axios-hooks": "^3.0.4",
"bootstrap": "^5.1.3",
"bootstrap": "^5.2.1",
"formik": "^2.2.9",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
6 changes: 1 addition & 5 deletions src/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,5 @@ $chat-nav-bubble-color: linear-gradient(
@import "~bootstrap/scss/variables";

// merge colors (Workaround BUG Bootstrap 5.1 https://github.com/twbs/bootstrap/issues/34756)
// bug should be fixed after 5.2.0 so we removed the code after the following line
$theme-colors: map.merge($theme-colors, $custom-colors);
$theme-colors-rgb: map-loop($theme-colors, to-rgb, "$value");
$utilities-text: map.merge($theme-colors, $utilities-text);
$utilities-text-colors: map-loop($utilities-text, rgba-css-var, "$key", "text");
$utilities-bg: map.merge($theme-colors, $utilities-bg);
$utilities-bg-colors: map-loop($utilities-bg, rgba-css-var, "$key", "bg");

0 comments on commit fdd636d

Please sign in to comment.