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

Next Version Bump #1894

Merged
merged 2 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions .github/workflows/lint-test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

# # Setup Auth token to push to github packages
- name: Set NPM Config
run: npm config set '//npm.pkg.github.com/:_authToken=${{ secrets.ACCESS_TOKEN }}'

- name: Install Yarn
env:
NODE_VERSION: ${{ matrix.node-version }}
Expand Down
2 changes: 2 additions & 0 deletions docs/app/views/application/_app_head_content.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
<link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
<link href="/favicon.ico" rel="icon" type="image/x-icon">
<%= csrf_meta_tags %>
<script type="module" src="https://cdn.jsdelivr.net/npm/@pine-ds/core/dist/pine-core/pine-core.esm.js"></script>
<script nomodule src="https://cdn.jsdelivr.net/npm/@pine-ds/core/dist/pine-core/index.esm.js"></script>
2 changes: 1 addition & 1 deletion docs/app/views/application/_nav.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
name: "stack"
},
} %>
<!-- COMING SOON
<!-- COMING SOON
<%= sage_component SageButton, {
value: "Interactions",
attributes: {
Expand Down
16 changes: 8 additions & 8 deletions docs/app/views/examples/components/alert/_preview.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ These also determine the icon that will appear by default.
color: "default",
title: "A default alert",
desc: demo_description,
icon_name: "sage-icon-info-circle-filled",
icon_name: "info-circle-filled",
} do %>
<% content_for :sage_alert_actions do %>
<%= sage_component SageButton, {
Expand All @@ -31,7 +31,7 @@ These also determine the icon that will appear by default.
color: "info",
title: "An informative alert",
desc: demo_description,
icon_name: "sage-icon-info-circle-filled",
icon_name: "info-circle-filled",
} do %>
<% content_for :sage_alert_actions do %>
<%= sage_component SageButton, {
Expand All @@ -44,7 +44,7 @@ These also determine the icon that will appear by default.
color: "success",
title: "An informative alert",
desc: demo_description,
icon_name: "sage-icon-check-circle-filled",
icon_name: "check-circle-filled",
} do %>
<% content_for :sage_alert_actions do %>
<%= sage_component SageButton, {
Expand All @@ -57,7 +57,7 @@ These also determine the icon that will appear by default.
color: "warning",
title: "Uh, oh! Here's a warning alert",
desc: demo_description,
icon_name: "sage-icon-danger-filled",
icon_name: "danger-filled",
} do %>
<% content_for :sage_alert_actions do %>
<%= sage_component SageButton, {
Expand All @@ -70,7 +70,7 @@ These also determine the icon that will appear by default.
color: "danger",
title: "Look out! This alert means there's an error",
desc: demo_description,
icon_name: "sage-icon-warning-filled",
icon_name: "warning-filled",
} do %>
<% content_for :sage_alert_actions do %>
<%= sage_component SageButton, {
Expand All @@ -91,7 +91,7 @@ These include a single primary action button and one or more additional secondar
color: "published",
title: "Alert with all actions",
desc: demo_description,
icon_name: "sage-icon-check-circle-filled",
icon_name: "check-circle-filled",
} do %>
<% content_for :sage_alert_actions do %>
<%= sage_component SageButton, {
Expand Down Expand Up @@ -134,7 +134,7 @@ You can listen for this event as it bubbles and respond as you see fit.
title: "This nifty alert can be dismissed",
desc: demo_description,
dismissable: true,
icon_name: "sage-icon-info-circle-filled",
icon_name: "info-circle-filled",
} do %>
<% content_for :sage_alert_actions do %>
<%= sage_component SageButton, {
Expand All @@ -156,7 +156,7 @@ They support all other properties with the exception of buttons in the `sage_ale
desc: demo_description,
small: true,
dismissable: true,
icon_name: "sage-icon-info-circle-filled",
icon_name: "info-circle-filled",
} do %>
<% content_for :sage_alert_actions do %>
<%= sage_component SageLink, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
color: "warning",
title: "Deprecated",
desc: "Catalog Item usage is no longer recommended. Please use the #{link_to "List component", "/pages/component/list"} instead to construct a similar experience or as a replacement option.".html_safe,
icon_name: "sage-icon-danger-filled",
icon_name: "danger-filled",
} %>

<%= sage_component SageCardList, {} do %>
Expand Down Expand Up @@ -75,7 +75,7 @@
<% 2.times do %>
<%= sage_component SageCatalogItem, {
title: "Fun For All – The Children Call: Their Favorite Time Of Year",
icon: "sage-icon-mail-xl",
icon: "mail",
href: "#"
} do %>
<%= sage_component SageButton, {
Expand Down
3 changes: 2 additions & 1 deletion docs/app/views/examples/components/choice/_preview.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ long_description = "Description with longer text to cause wrapping and make the
target: "example",
text: "Option 1",
type: "icon",
icon: "video-on"
icon: "video-on",
subtext: "Description of Option 1",
}
%>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
color: "warning",
title: "Deprecated",
desc: "Dynamic Select is deprecated and no longer recommended. Please reach out for #{link_to "support or any questions", "/pages/support"}.".html_safe,
icon_name: "sage-icon-danger-filled",
icon_name: "danger-filled",
} %>

<h3>Working with the<code>Sage Dynamic Select Input (Select2)</code></h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

<!-- Default -->
<h3 class="t-sage-heading-6">Default</h3>
<%= sage_component SageFormSection, {
<%= sage_component SageFormSection, {
id:"c1",
title: "Form Section Title",
subtitle: "Helpful text that lets the customer have an idea how to work with the section.",
} do %>
<%= sage_component SageAlert, {
title: "Form Section Content Will Go Here",
desc: "This component is designed to be very flexible and take any sort of content you want to pass to it.",
icon_name: "sage-icon-info-circle",
icon_name: "info-circle",
} %>
<% end %>

<!-- Custom title_tag -->
<h3 class="t-sage-heading-6">Form Section with custom header tag</h3>
<%= sage_component SageFormSection, {
<%= sage_component SageFormSection, {
id:"c2",
title: "Custom Title Tag",
subtitle: "Helpful text that lets the customer have an idea how to work with the section.",
Expand All @@ -25,19 +25,19 @@
<%= sage_component SageAlert, {
title: "Form Section Content Will Go Here",
desc: "This component is designed to be very flexible and take any sort of content you want to pass to it.",
icon_name: "sage-icon-info-circle",
icon_name: "info-circle",
} %>
<% end %>

<h3 class="t-sage-heading-6">With Custom Subtitle</h3>
<%= sage_component SageFormSection, {
<%= sage_component SageFormSection, {
id:"c1",
title: "Form Section Title",
} do %>
<%= sage_component SageAlert, {
title: "Form Section Content Will Go Here",
desc: "This component is designed to be very flexible and take any sort of content you want to pass to it.",
icon_name: "sage-icon-info-circle",
icon_name: "info-circle",
} %>
<%= content_for :sage_form_section_subtitle do %>
<p>Helpful text that lets the customer have an idea how to work with the section.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
items: [
{
bullet: %(
<i class="sage-icon-circle-1 t-sage--color-charcoal-300"></i>
<pds-icon name="circle-1" class="t-sage--color-charcoal-300""></pds-icon>
),
body: %(
<h4 class="sage-icon-list-item__title">Lorem ipsum dolor sit amet</h4>
Expand All @@ -12,7 +12,7 @@
},
{
bullet: %(
<i class="sage-icon-circle-2 t-sage--color-charcoal-300"></i>
<pds-icon name="circle-2" class="t-sage--color-charcoal-300""></pds-icon>
),
body: %(
<h4 class="sage-icon-list-item__title">Lorem ipsum dolor sit amet</h4>
Expand All @@ -21,7 +21,7 @@
},
{
bullet: %(
<i class="sage-icon-circle-3 t-sage--color-charcoal-300"></i>
<pds-icon name="circle-3" class="t-sage--color-charcoal-300""></pds-icon>
),
body: %(
<h4 class="sage-icon-list-item__title">Lorem ipsum dolor sit amet</h4>
Expand Down
20 changes: 10 additions & 10 deletions docs/app/views/examples/components/panel/_preview.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Ut elementum id leo ac fringilla.
<%= sage_component SageAlert, {
color: "warning",
desc: "While this page depicts Panels within Cards, this is merely a consequence of our documentation structure and not a pattern that should be implemented elsewhere.",
icon_name: "sage-icon-warning",
icon_name: "warning",
} %>

<h2>Overview</h2>
Expand Down Expand Up @@ -70,25 +70,25 @@ There are a few options for the panel body container.
<%= sage_component SagePanelStack, {} do %>
<%= sage_component SageCard, {} do %>
<%= sage_component SageCardRow, { grid_template: "et" } do %>
<i class="sage-icon-video-on"></i>
<%= sage_component SageIcon, { icon: "video-on" } %>
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span>
<% end %>
<% end %>
<%= sage_component SageCard, {} do %>
<%= sage_component SageCardRow, { grid_template: "et" } do %>
<i class="sage-icon-video-on"></i>
<%= sage_component SageIcon, { icon: "video-on" } %>
<span>Morbi rhoncus mauris ut turpis gravida bibendum.</span>
<% end %>
<% end %>
<%= sage_component SageCard, {} do %>
<%= sage_component SageCardRow, { grid_template: "et" } do %>
<i class="sage-icon-video-on"></i>
<%= sage_component SageIcon, { icon: "video-on" } %>
<span>Donec feugiat accumsan velit et semper.</span>
<% end %>
<% end %>
<%= sage_component SageCard, {} do %>
<%= sage_component SageCardRow, { grid_template: "et" } do %>
<i class="sage-icon-video-on"></i>
<%= sage_component SageIcon, { icon: "video-on" } %>
<span>Ut elementum id leo ac fringilla.</span>
<% end %>
<% end %>
Expand All @@ -102,19 +102,19 @@ There are a few options for the panel body container.
<%= sage_component SagePanel, {} do %>
<%= sage_component SagePanelList, {} do %>
<%= sage_component SagePanelListItem, { grid_template: "et" } do %>
<i class="sage-icon-video-on"></i>
<%= sage_component SageIcon, { icon: "video-on" } %>
<span class="t-sage-body">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span>
<% end %>
<%= sage_component SagePanelListItem, { grid_template: "et" } do %>
<i class="sage-icon-video-on"></i>
<%= sage_component SageIcon, { icon: "video-on" } %>
<span class="t-sage-body">Morbi rhoncus mauris ut turpis gravida bibendum.</span>
<% end %>
<%= sage_component SagePanelListItem, { grid_template: "et" } do %>
<i class="sage-icon-video-on"></i>
<%= sage_component SageIcon, { icon: "video-on" } %>
<span class="t-sage-body">Donec feugiat accumsan velit et semper.</span>
<% end %>
<%= sage_component SagePanelListItem, { grid_template: "et" } do %>
<i class="sage-icon-video-on"></i>
<%= sage_component SageIcon, { icon: "video-on" } %>
<span class="t-sage-body">Ut elementum id leo ac fringilla.</span>
<% end %>
<% end %>
Expand All @@ -132,7 +132,7 @@ There are a few options for the panel body container.

<%= sage_component SagePanel, {} do %>
<%= sage_component SagePanelRow, { grid_template: "ete" } do %>
<i class="sage-icon-check-circle-xl t-sage--color-sage"></i>
<%= sage_component SageIcon, { icon: "check-circle", css_classes: "t-sage--color-sage" } %>
<%= sage_component SagePanelBlock, {} do %>
<p class="t-sage-body-semi">Lorem ipsum dolor sit amet</p>
<p class="t-sage-body-small t-sage--color-grey">consectetur adipiscing elit</p>
Expand Down
10 changes: 10 additions & 0 deletions docs/app/views/examples/components/search/_preview.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,13 @@
hide_label: true,
label_text: "Search"
} %>

<h3 class="t-sage-heading-6">Disabled</h3>
<%= sage_component SageSearch, {
id: "search-4",
placeholder: "Search Coupons",
value: nil,
contained: true,
label_text: "Search",
disabled: true,
} %>
2 changes: 1 addition & 1 deletion docs/app/views/examples/components/tabs/_preview.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
attributes: {
href: "//example.com/basic-test2"
},
icon: "filters"
icon: "filter"
},
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<% items.each do |item| %>
<li class="sage-typeahead__item">
<button class="sage-typeahead__item-trigger">
<i class="sage-icon-<%= item[:icon] %>" style="grid-area: icon;"></i>
<pds-icon name="<%= item[:icon] %>" class="sage-icon-<%= item[:icon] %>" style="grid-area: icon;"></pds-icon>
<div class="t-sage-heading-6" style="grid-area: title;">
<%= item[:title] %>
</div>
Expand Down
8 changes: 4 additions & 4 deletions docs/app/views/pages/icon.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ dialogue_icons = [
<%= content_for :heading do %>
<%= md(%(
# Icons
<p class="docs-heading__lead">Our icon set includes those shown below. The typical pattern for these is to use an <code>&lt;i&gt;</code> tag with a class as indicated below.</p>
<p class="docs-heading__lead">Our icon set includes those shown below.</p>
)) %>
<% end %>
<%= content_for :quick_links do %>
Expand Down Expand Up @@ -237,7 +237,7 @@ Marketing uses the Megaphone icon. We do not use the megaphone icon for other tr
<% action_icons.each do |icon| %>
<div class="docs-icon-inline">
<%= sage_component SageCardRow, { grid_template: "it" } do %>
<i class="sage-icon-<%= icon[:name] %>-xl" aria-hidden="true"></i>
<pds-icon class="sage-icon-<%= icon[:name] %>-xl" name="<%= icon[:name] %>" size="xl"></pds-icon>
<p class="docs-icon-inline__label"><%= icon[:name] %></p>
<p class="docs-icon-inline__usage"><strong><%= icon[:action] %></strong> Actions</p>
<% end %>
Expand All @@ -250,7 +250,7 @@ Marketing uses the Megaphone icon. We do not use the megaphone icon for other tr
<% feature_icons.each do |icon| %>
<div class="docs-icon-inline">
<%= sage_component SageCardRow, { grid_template: "it" } do %>
<i class="sage-icon-<%= icon[:name] %>-xl" aria-hidden="true"></i>
<pds-icon class="sage-icon-<%= icon[:name] %>-xl" name="<%= icon[:name] %>" size="xl"></pds-icon>
<p class="docs-icon-inline__label"><%= icon[:name] %></p>
<p class="docs-icon-inline__usage"><strong><%= icon[:action] %></strong></p>
<% end %>
Expand All @@ -263,7 +263,7 @@ Marketing uses the Megaphone icon. We do not use the megaphone icon for other tr
<% dialogue_icons.each do |icon| %>
<div class="docs-icon-inline">
<%= sage_component SageCardRow, { grid_template: "it" } do %>
<i class="sage-icon-<%= icon[:name] %>-xl" aria-hidden="true"></i>
<pds-icon class="sage-icon-<%= icon[:name] %>-xl" name="<%= icon[:name] %>" size="xl"></pds-icon>
<p class="docs-icon-inline__label"><%= icon[:name] %></p>
<p class="docs-icon-inline__usage"><strong><%= icon[:action] %></strong> Dialogues</p>
<% end %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<%= component.generated_html_attributes.html_safe %>
>
<% if component.icon_name %>
<i class="sage-alert__icon <%= component.icon_name %>" aria-hidden="true"></i>
<pds-icon name="<%= component.icon_name %>" class="sage-alert__icon"></pds-icon>
<% end %>
<div class="sage-alert__copy">
<% if component.title %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
<span class="sage-badge__value-text">
<%= component.value.html_safe %>
</span>
<%= component.content %>
<% if component.interactive_type %>
<pds-icon name="down-small" size="12px" class="sage-badge__decor-icon sage-badge__decor-icon--down-small"></pds-icon>
<% end %>
</<%= badge_content_tag %>>
<%= component.content %>
<% if component.interactive_type %>
<span class="sage-badge__decor-icon sage-badge__decor-icon--down-small"></span>
<% end %>
</span>

Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<% if component.type == 'secondary' %>
<% icon_name = 'info-circle' %>
<% elsif component.type == 'warning' %>
<% icon_name = 'warning' %>
<% elsif component.type == 'danger' %>
<% icon_name = 'danger' %>
<% else %>
<% icon_name = 'flag' %>
<% end %>

<% if component.banner_context.present? %>
<div class="
sage-banner-wrapper
Expand All @@ -16,6 +26,9 @@
<%= "aria-hidden=true" if !component.active %>
<%= component.generated_html_attributes.html_safe %>
>
<% if component.type.present? || "default" %>
<pds-icon name="<%= icon_name %>" size="16px" class="sage-banner__icon"></pds-icon>
<% end %>
<% if component.text.present? %>
<p class="sage-banner__text">
<%= component.text %>
Expand Down
Loading
Loading