Skip to content

Commit 8a255bd

Browse files
pixelflipsQuintonJasondependabot[bot]
authored
Next Version Bump (#2161)
* fix: add semantic tokens and dark mode support (#2156) * feat: add ds-tokens and semantic tokens * fix: resolve build error * feat: update core to semantic tokens * feat: validate tokens * feat: add dark mode toggle * fix: color update * fix: update maps to preserve token values * fix: update heading values * fix: update tokens and dark mode values * fix: update token values * fix: update semantic token mapping from loop * fix: token cleanup * fix: remove dark mode temp files * fix: update color token pairings * fix: update ds tokens dark mode dev version * fix(sage-alert): update colors to match pine alert * fix(sage-alert): update alert close button color * fix: update subtle button dark mode colors * fix: add latest ds tokens * fix: remove console warnings * fix: update buttons hover colors * fix: remove problematic @import from _ds_tokens.scss - Reverted automatic Pine tokens import that broke Vite builds - The ~@ prefix is webpack-specific and incompatible with Vite - Tokens are now documented as requiring app-level loading (CDN or import) - Added Pine tokens import to sage-lib docs specifically (webpack env) - Bumped version to 6.2.25-dev.9 * fix(button): move dark theme override to end of file for CSS cascade - Move [data-theme="dark"] block to Theme Overrides section at EOF - Ensures dark theme styles properly override generated button styles - Add comment to prevent future regressions Bump sage-assets to 6.2.25-dev.11 * fix: update to latest packs and dropdown semantic border * style: update to use semantic tokens grey black white * fix: update semantic tokens names * fix: update to semantic values * fix: add lock file * fix: update to ds tokens 1.0.1 * fix: remove hard coded dark mode attr * fix: resolve linter errors * style: oop fix * style: oop fix * style: oop fix * fix: oop fix * fix: oop fix * fix: remove ds tokens dependancy * fix: align alert switch and tooltip to pine styles * fix: align badge input popover property and form element error message * fix: update disabled border * fix: added border's to modal like things * fix: lint error fix * fix: update tokens * fix: remove yarn dependancy * fix: update hero custom bg example * fix: updated pagination * style: updated alerts and banner to core tokens * fix: update dark mode error state * fix: remove border and update lang * fix: update alert icon and text colors * fix: update alert and button color * fix: update disabled select icon color * chore: update yarn lock * fix: update token values remove commented file and update token version * fix: remove instance of mercury color (#2160) * fix: remove instance of mercury color * fix: remove already called rules * chore(deps): bump @pine-ds/icons from 9.12.0 to 9.13.0 (#2159) Bumps [@pine-ds/icons](https://github.com/Kajabi/pine-icons) from 9.12.0 to 9.13.0. - [Release notes](https://github.com/Kajabi/pine-icons/releases) - [Changelog](https://github.com/Kajabi/pine-icons/blob/main/CHANGELOG.md) - [Commits](Kajabi/pine-icons@v9.12.0...v9.13.0) --- updated-dependencies: - dependency-name: "@pine-ds/icons" dependency-version: 9.13.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Quinton Jason <quinton.jason@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 2ad8500 commit 8a255bd

File tree

9 files changed

+26
-10
lines changed

9 files changed

+26
-10
lines changed

docs/lib/sage-frontend/stylesheets/docs/_colors.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
// Determine class name for $value == 50
5454
$classname: ".color-#{"" + $name}-#{$value}";
5555

56+
/* stylelint-disable block-closing-brace-newline-after */
5657
// This should be numeric, not string
5758
@if ($value == 50) {
5859
$classname: ".color-#{"" + $name}-0#{$value}";
@@ -78,6 +79,7 @@
7879
text-transform: uppercase;
7980
}
8081
}
82+
/* stylelint-enable block-closing-brace-newline-after */
8183
}
8284
}
8385
/* stylelint-enable max-nesting-depth */

docs/lib/sage_rails/app/views/sage_components/_sage_avatar.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ end
5252
<% end %>
5353

5454
<% if !component.initials && !component.image %>
55-
<pds-icon name="user-filled" color="var(--pine-color-mercury-500)" class="sage-avatar__graphic"></pds-icon>
55+
<pds-icon name="user-filled" color="var(--pine-color-brand)" class="sage-avatar__graphic"></pds-icon>
5656
<% end %>
5757

5858
<% if component.image %>

docs/lib/sage_rails/app/views/sage_components/_sage_loader.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%
22
component_description = component.type === "success" ? "Success" : "Loading..."
3-
stroke_color = SageTokens::COLOR_PALETTE[:MERCURY_400]
3+
stroke_color = "var(--pine-color-brand)"
44
%>
55

66
<div class="

docs/lib/sage_rails/app/views/sage_components/_sage_progress_bar.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
animate = component.animate.nil? ? true : component.animate
33
content = component.label ? "#{component.label}: " : ""
44
content << "#{component.percent}%&nbsp;progress"
5-
color = component.color || SageTokens::COLOR_PALETTE[:MERCURY_500]
5+
color = component.color || "var(--pine-color-brand)"
66
%>
77

88
<div

packages/sage-assets/lib/stylesheets/components/_avatar.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $-avatar-ring-colors: (
3030
),
3131
orange: (
3232
main: var(--pine-color-brand),
33-
bg: var(--pine-color-mercury-150)
33+
bg: var(--pine-color-grey-150)
3434
),
3535
red: (
3636
main: var(--pine-color-danger),
@@ -64,7 +64,7 @@ $-avatar-group-item-sizes: (
6464
width: $-avatar-min-size;
6565
height: $-avatar-min-size;
6666
border-radius: var(--pine-border-radius-full);
67-
background-color: var(--pine-color-mercury-050);
67+
background-color: var(--pine-color-grey-050);
6868

6969
// Documentation-specific styles
7070
.sage-avatar-wrapper > & {

packages/sage-react/lib/Avatar/Avatar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export const Avatar = ({
8282
<img alt={image.alt || ''} className="sage-avatar__image" src={image.src} id={image.id} />
8383
)}
8484
{(!image.src || useFallbackGraphic) && (
85-
<pds-icon name="user-filled" color="var(--pine-color-mercury-500)" class="sage-avatar__graphic" />
85+
<pds-icon name="user-filled" color="var(--pine-color-brand)" class="sage-avatar__graphic" />
8686
)}
8787
</div>
8888
);

packages/sage-react/lib/ProgressBar/ProgressBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ProgressBar.defaultProps = {
8181
animate: true,
8282
backgroundColor: null,
8383
className: null,
84-
color: ProgressBar.COLORS.MERCURY_500,
84+
color: ProgressBar.COLORS.GREY_500,
8585
disableTooltip: false,
8686
displayPercent: false,
8787
label: null,

packages/sage-react/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
"npm-run-all": "^4.1.5",
7777
"react-is": "16.13.1",
7878
"react-test-renderer": "16.13.1",
79+
"resize-observer-polyfill": "^1.5.1",
7980
"sass-loader": "^10.0.2",
8081
"typescript": "4.0.3",
8182
"url-loader": "^4.1.0",
@@ -91,6 +92,7 @@
9192
"html-react-parser": "^0.14.2",
9293
"pluralize": "^8.0.0",
9394
"prop-types": "^15.7.2",
95+
"raf": "^3.4.1",
9496
"react-docgen": "^5.4.3",
9597
"react-sortablejs": "6.0.0",
9698
"react-uuid": "^1.0.2",

yarn.lock

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2849,9 +2849,9 @@
28492849
"@octokit/openapi-types" "^12.11.0"
28502850

28512851
"@pine-ds/icons@^9.12.0":
2852-
version "9.12.0"
2853-
resolved "https://registry.yarnpkg.com/@pine-ds/icons/-/icons-9.12.0.tgz#0fd44b1f24492784f03d50a2897469e643a74634"
2854-
integrity sha512-m0xQYFrxFQ+ycffZvwyv2L0goSULkGInqI8+xhZgSQTPC7J1zROrTfNJC/gAdx07HMqn1h4QUVlPu7dyqr9cGg==
2852+
version "9.13.0"
2853+
resolved "https://registry.yarnpkg.com/@pine-ds/icons/-/icons-9.13.0.tgz#f6e1849641f1dbe77023179343d84924865dadf7"
2854+
integrity sha512-c2S96Kf36zeU4tD72tNmLyfmnT6+RQRXfmGWYi/DpmczbF5Dy6vVh84TFXz7o7QPhlETWVdnVwZP0xMyH8pkQA==
28552855
dependencies:
28562856
"@stencil/core" "4.38.3"
28572857

@@ -16420,6 +16420,13 @@ quick-lru@^4.0.1:
1642016420
resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"
1642116421
integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
1642216422

16423+
raf@^3.4.1:
16424+
version "3.4.1"
16425+
resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
16426+
integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
16427+
dependencies:
16428+
performance-now "^2.1.0"
16429+
1642316430
ramda@^0.28.0:
1642416431
version "0.28.0"
1642516432
resolved "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz"
@@ -17228,6 +17235,11 @@ requires-port@^1.0.0:
1722817235
resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
1722917236
integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
1723017237

17238+
resize-observer-polyfill@^1.5.1:
17239+
version "1.5.1"
17240+
resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
17241+
integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
17242+
1723117243
resolve-cwd@^2.0.0:
1723217244
version "2.0.0"
1723317245
resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"

0 commit comments

Comments
 (0)