Skip to content

Commit

Permalink
Merge branch 'main' into list-option-groups
Browse files Browse the repository at this point in the history
  • Loading branch information
atmgrifter00 authored May 30, 2024
2 parents 63bc230 + aca764d commit c39122a
Show file tree
Hide file tree
Showing 71 changed files with 924 additions and 412 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

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

15 changes: 15 additions & 0 deletions packages/angular-workspace/nimble-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/nimble-angular",
"entries": [
{
"date": "Tue, 28 May 2024 20:13:14 GMT",
"version": "24.3.3",
"tag": "@ni/nimble-angular_v24.3.3",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v29.1.6",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 22 May 2024 18:32:15 GMT",
"version": "24.3.2",
Expand Down
10 changes: 9 additions & 1 deletion packages/angular-workspace/nimble-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/nimble-angular

This log was last generated on Wed, 22 May 2024 18:32:15 GMT and should not be manually modified.
This log was last generated on Tue, 28 May 2024 20:13:14 GMT and should not be manually modified.

<!-- Start content -->

## 24.3.3

Tue, 28 May 2024 20:13:14 GMT

### Patches

- Bump @ni/nimble-components to v29.1.6

## 24.3.2

Wed, 22 May 2024 18:32:15 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/angular-workspace/nimble-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-angular",
"version": "24.3.2",
"version": "24.3.3",
"description": "Angular components for the NI Nimble Design System",
"scripts": {
"invoke-publish": "npm run invoke-publish:setup && cd ../dist/nimble-angular && npm publish",
Expand Down Expand Up @@ -32,7 +32,7 @@
"@angular/forms": "^16.2.12",
"@angular/localize": "^16.2.12",
"@angular/router": "^16.2.12",
"@ni/nimble-components": "^29.1.5"
"@ni/nimble-components": "^29.1.6"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
15 changes: 15 additions & 0 deletions packages/angular-workspace/spright-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/spright-angular",
"entries": [
{
"date": "Tue, 28 May 2024 20:13:14 GMT",
"version": "1.0.7",
"tag": "@ni/spright-angular_v1.0.7",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-angular",
"comment": "Bump @ni/spright-components to v1.0.7",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 22 May 2024 18:32:15 GMT",
"version": "1.0.6",
Expand Down
10 changes: 9 additions & 1 deletion packages/angular-workspace/spright-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/spright-angular

This log was last generated on Wed, 22 May 2024 18:32:15 GMT and should not be manually modified.
This log was last generated on Tue, 28 May 2024 20:13:14 GMT and should not be manually modified.

<!-- Start content -->

## 1.0.7

Tue, 28 May 2024 20:13:14 GMT

### Patches

- Bump @ni/spright-components to v1.0.7

## 1.0.6

Wed, 22 May 2024 18:32:15 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/angular-workspace/spright-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/spright-angular",
"version": "1.0.6",
"version": "1.0.7",
"description": "Angular components for NI Spright",
"scripts": {
"invoke-publish": "npm run invoke-publish:setup && cd ../dist/spright-angular && npm publish",
Expand All @@ -24,7 +24,7 @@
"peerDependencies": {
"@angular/common": "^16.2.12",
"@angular/core": "^16.2.12",
"@ni/spright-components": "^1.0.6"
"@ni/spright-components": "^1.0.7"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
15 changes: 15 additions & 0 deletions packages/nimble-components/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/nimble-components",
"entries": [
{
"date": "Tue, 28 May 2024 20:13:14 GMT",
"version": "29.1.6",
"tag": "@ni/nimble-components_v29.1.6",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "2855db4fe58a8d1df112ea656215696d9582f9ea",
"comment": "Update banner styling to align with visual design spec"
}
]
}
},
{
"date": "Wed, 22 May 2024 18:32:15 GMT",
"version": "29.1.5",
Expand Down
10 changes: 9 additions & 1 deletion packages/nimble-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/nimble-components

This log was last generated on Wed, 22 May 2024 18:32:15 GMT and should not be manually modified.
This log was last generated on Tue, 28 May 2024 20:13:14 GMT and should not be manually modified.

<!-- Start content -->

## 29.1.6

Tue, 28 May 2024 20:13:14 GMT

### Patches

- Update banner styling to align with visual design spec ([ni/nimble@2855db4](https://github.com/ni/nimble/commit/2855db4fe58a8d1df112ea656215696d9582f9ea))

## 29.1.5

Wed, 22 May 2024 18:32:15 GMT
Expand Down
2 changes: 1 addition & 1 deletion packages/nimble-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-components",
"version": "29.1.5",
"version": "29.1.6",
"description": "Styled web components for the NI Nimble Design System",
"scripts": {
"build": "npm run generate-icons && npm run generate-workers && npm run build-components && npm run bundle-components && npm run generate-scss",
Expand Down
56 changes: 6 additions & 50 deletions packages/nimble-components/src/banner/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,12 @@ import {
import { display } from '../utilities/style/display';

import {
actionRgbPartialColor,
applicationBackgroundColor,
bodyFont,
borderHoverColor,
buttonLabelFontColor,
bodyFontColor,
controlHeight,
controlSlimHeight,
fillSelectedColor,
iconColor,
iconSize,
linkActiveFontColor,
linkDisabledFontColor,
linkFontColor,
smallPadding,
standardPadding
} from '../theme-provider/design-tokens';
import { Theme } from '../theme-provider/types';
Expand All @@ -40,15 +33,14 @@ export const styles = css`
font-size: 12.8px;
align-items: top;
overflow: hidden;
color: ${White};
${iconColor.cssCustomProperty}: ${hexToRgbaCssColor(White, 0.6)};
}
:host(:not([open])) {
display: none;
}
.container {
color: ${bodyFontColor};
display: flex;
width: 100%;
}
Expand All @@ -59,6 +51,7 @@ export const styles = css`
justify-content: center;
margin-top: 8px;
flex: 0 0 auto;
opacity: 0.6;
}
.text {
Expand All @@ -85,6 +78,8 @@ export const styles = css`
align-items: center;
justify-content: center;
align-self: flex-start;
margin-top: ${smallPadding};
${controlHeight.cssCustomProperty}: ${controlSlimHeight};
}
slot[name='action'] {
Expand All @@ -95,53 +90,14 @@ export const styles = css`
}
slot[name='action']::slotted(nimble-anchor) {
${linkFontColor.cssCustomProperty}: ${White};
${linkDisabledFontColor.cssCustomProperty}: ${White};
${linkActiveFontColor.cssCustomProperty}: ${hexToRgbaCssColor(
White,
0.6
)};
font-size: 12.8px;
}
slot[name='action']::slotted(nimble-button) {
${controlHeight.cssCustomProperty}: ${controlSlimHeight};
${buttonLabelFontColor.cssCustomProperty}: ${White};
${fillSelectedColor.cssCustomProperty}: ${hexToRgbaCssColor(
White,
0.2
)};
${borderHoverColor.cssCustomProperty}: ${White};
}
slot[name='action']::slotted(nimble-button[appearance='outline']) {
${actionRgbPartialColor.cssCustomProperty}: ${White}
}
.dismiss {
width: 48px;
display: flex;
justify-content: center;
}
.dismiss nimble-button {
${controlHeight.cssCustomProperty}: 16px;
${iconSize.cssCustomProperty}: 14px;
${buttonLabelFontColor.cssCustomProperty}: ${White};
${borderHoverColor.cssCustomProperty}: transparent;
${fillSelectedColor.cssCustomProperty}: ${hexToRgbaCssColor(
White,
0.2
)};
}
.dismiss nimble-button:focus-within {
outline: 2px solid ${White};
}
.dismiss nimble-button:hover {
background: ${hexToRgbaCssColor(White, 0.2)};
}
`.withBehaviors(
themeBehavior(
Theme.light,
Expand Down
Loading

0 comments on commit c39122a

Please sign in to comment.