Skip to content

Commit

Permalink
Merge pull request #92 from perimetre/7.9.2
Browse files Browse the repository at this point in the history
7.9.2
  • Loading branch information
dgonzalez-perimetre authored Oct 13, 2022
2 parents d29fac9 + 3f3fa11 commit 3eb059d
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

## [7.9.1] 2022-10-13

### Fixed

- Fix pui-btn-default button styles overwritten by anchor styles inside pui-prose class

## [7.9.1] 2022-10-05

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@perimetre/ui",
"description": "A component library made by @perimetre",
"version": "7.9.1",
"version": "7.9.2",
"repository": {
"type": "git",
"url": "git+https://github.com/perimetre/ui.git"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/* Adds a text color */
/* Makes the border expect the placeholder color */
/* Makes the background expect the placeholder color */
@apply pui-btn text-pui-paragraph-0 border-pui-placeholder-color bg-pui-placeholder-color;
@apply pui-btn text-pui-btn-text-0 border-pui-placeholder-color bg-pui-placeholder-color;

/* If the button is not a chip button */
&:not(.pui-chip-btn) {
Expand Down
5 changes: 5 additions & 0 deletions src/components/HTMLParsedContent/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
/* Apply the prose class */
@apply prose;

.pui-btn-default {
@apply !text-pui-btn-text-0;
text-decoration: none !important;
}

/* Before customizing the prose css from here, try to customize it
in the default-preset.js "typography" extend value first.
By reading the tailwind typography plugin documentation */
Expand Down
4 changes: 4 additions & 0 deletions src/presets/default-preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ module.exports = {
// Title and bolder color
900: 'var(--pui-paragraph-900, #333333)'
},
'pui-btn-text': {
// White text color, to use as default
0: 'var(--pui-btn-text-0, #fff)'
},
// --------------- Colors under this are not theme related, and only are here so tailwind can generate helpers for them
// Add a reset color
'pui-initial': 'initial',
Expand Down

0 comments on commit 3eb059d

Please sign in to comment.