diff --git a/package.json b/package.json index 4c076a9c..e8f40586 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dev.core": "nx start @go-ui/core", "dev.docs": "nx build @go-ui/core && concurrently --kill-others \"npm:watch.ia\" \"nx start @go-ui/docs\"", "dev.react.app": "nx start @go-ui/react-starter", - "dev.vue.app": "nx dev @go-ui/vue-starter", + "dev.vue": "nx dev @go-ui/vue", "build.libs": "pnpm --stream -r --filter \"./packages/**\" build", "build.docs": "nx build @go-ui/docs", "build.ia": "nx build.ia @go-ui/docs", diff --git a/packages/core/src/components/form/go-fieldset/go-fieldset.scss b/packages/core/src/components/form/go-fieldset/go-fieldset.scss index d83ff983..a3cd6bff 100644 --- a/packages/core/src/components/form/go-fieldset/go-fieldset.scss +++ b/packages/core/src/components/form/go-fieldset/go-fieldset.scss @@ -14,4 +14,8 @@ go-fieldset { @include unstyled-list; } } + + .go-field { + margin-top: 0; + } } diff --git a/packages/core/src/components/go-overlay/go-overlay.scss b/packages/core/src/components/go-overlay/go-overlay.scss index 5e0ed2b0..09e86372 100644 --- a/packages/core/src/components/go-overlay/go-overlay.scss +++ b/packages/core/src/components/go-overlay/go-overlay.scss @@ -21,8 +21,10 @@ go-overlay { } .overlay-bg { position: absolute; - width: 100%; - height: 100vh; + top: 0; + left: 0; + right: 0; + bottom: 0; } .overlay-content { position: relative; diff --git a/packages/core/src/components/navigation/go-main-nav/go-main-nav.scss b/packages/core/src/components/navigation/go-main-nav/go-main-nav.scss index b0112e21..92736fb9 100644 --- a/packages/core/src/components/navigation/go-main-nav/go-main-nav.scss +++ b/packages/core/src/components/navigation/go-main-nav/go-main-nav.scss @@ -61,8 +61,10 @@ go-main-nav { text-decoration: none; background: var(--nav-item-bg-color); border-bottom: var(--nav-item-current-bar-width) solid transparent; + @include transition(background); &:hover, &:focus { + border-radius: var(--radius-2); background: var(--nav-item-hover-bg-color); } diff --git a/packages/core/src/components/navigation/go-nav-link/go-nav-link.scss b/packages/core/src/components/navigation/go-nav-link/go-nav-link.scss index ce63fb16..f89f6deb 100644 --- a/packages/core/src/components/navigation/go-nav-link/go-nav-link.scss +++ b/packages/core/src/components/navigation/go-nav-link/go-nav-link.scss @@ -62,6 +62,7 @@ go-nav-link { } a.nav-item-link { + @include transition(background); .nav-link-text { @include underline; } diff --git a/packages/core/src/global/scss/_spacing.scss b/packages/core/src/global/scss/_spacing.scss index 344f31dd..408f053d 100644 --- a/packages/core/src/global/scss/_spacing.scss +++ b/packages/core/src/global/scss/_spacing.scss @@ -6,14 +6,19 @@ $directions: ( 'b': 'bottom', '': '', ); -$spacer: 1rem; +$spacer: 0.5rem; $spacers: ( 0: 0, - 1: $spacer * 0.25, - 2: $spacer * 0.5, - 3: $spacer, - 4: $spacer * 1.5, - 5: $spacer * 3, + 1: $spacer, + 2: 2 * $spacer, + 3: 3 * $spacer, + 4: 4 * $spacer, + 5: 5 * $spacer, + 6: 6 * $spacer, + 7: 7 * $spacer, + 8: 8 * $spacer, + 9: 9 * $spacer, + 10: 10 * $spacer, ); @mixin make-space($dir-name, $dir, $spacer, $spacing-type) { diff --git a/packages/core/src/index.html b/packages/core/src/index.html index 1eb253ce..80b274cd 100644 --- a/packages/core/src/index.html +++ b/packages/core/src/index.html @@ -17,16 +17,134 @@ - - Option 1 - Option 2 - Option 3 - + + + + diff --git a/packages/core/src/patterns/go-heading-row/go-heading-row.tsx b/packages/core/src/patterns/go-heading-row/go-heading-row.tsx index 8c0175ca..77a622c8 100644 --- a/packages/core/src/patterns/go-heading-row/go-heading-row.tsx +++ b/packages/core/src/patterns/go-heading-row/go-heading-row.tsx @@ -30,28 +30,37 @@ export class GoHeadingRow { hasHeadingSlot: boolean; + hasActionSlot: boolean; + + componentWillLoad() { + this.hasHeadingSlot = !!this.el.querySelector('slot[name="heading"]'); + this.hasActionSlot = !!this.el.querySelector('slot[name="action"]'); + } + render() { - const { heading, moreLinkHref, moreLinkText, hasHeadingSlot, headingTag: HeadingTag } = this; + const { heading, moreLinkHref, moreLinkText, hasHeadingSlot, hasActionSlot, headingTag: HeadingTag } = this; const shouldRenderHeading = heading || hasHeadingSlot; - const shouldRenderMoreLink = moreLinkHref && moreLinkText; + const shouldRenderMoreLink = (moreLinkHref && moreLinkText) || hasActionSlot; return ( {shouldRenderHeading || shouldRenderMoreLink ? (
{shouldRenderHeading ? ( - + {heading} ) : ( )} {shouldRenderMoreLink ? ( - + + + ) : null}
) : null} diff --git a/packages/vue/src/components/GoRadio.vue b/packages/vue/src/components/GoRadio.vue index b30bbf06..f8155fae 100644 --- a/packages/vue/src/components/GoRadio.vue +++ b/packages/vue/src/components/GoRadio.vue @@ -4,12 +4,9 @@