Skip to content
Snippets Groups Projects
Commit 3a01aaa3 authored by druid's avatar druid
Browse files

merge dev into master

parents 12e9457b 43433a44
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/components/navigation/menu/readme.md
+ 12
− 12
View file @ 3a01aaa3
......@@ -4,18 +4,18 @@
## Properties
| Property | Attribute | Description | Type | Default |
| ---------------------------- | ------------------------------- | ----------- | ---------------------------------------------------------------------------- | ------------------ |
| `dataMenuDonate` | `data-menu-donate` | | `string` | `undefined` |
| `dataMenuLanguage` | `data-menu-language` | | `string` | `undefined` |
| `isDemo` | `is-demo` | | `boolean` | `false` |
| `labelFrontPage` | `label-front-page` | | `string` | `undefined` |
| `logoLabel` | `logo-label` | | `string` | `undefined` |
| `logoUrl` | `logo-url` | | `string` | `undefined` |
| `menuButtonBreadcrumbReturn` | `menu-button-breadcrumb-return` | | `string` | `undefined` |
| `menuButtonSubmenuExpand` | `menu-button-submenu-expand` | | `string` | `undefined` |
| `menuIsOpen` | `menu-is-open` | | `boolean` | `true` |
| `menuType` | `menu-type` | | `MenuType.desktop \| MenuType.mobile \| MenuType.sidenav \| MenuType.tablet` | `MenuType.desktop` |
| Property | Attribute | Description | Type | Default |
| ---------------------------- | ------------------------------- | ----------- | -------------------------------------------------------------------------------------------------- | ------------------ |
| `dataMenuDonate` | `data-menu-donate` | | `string` | `undefined` |
| `dataMenuLanguage` | `data-menu-language` | | `string` | `undefined` |
| `isDemo` | `is-demo` | | `boolean` | `false` |
| `labelFrontPage` | `label-front-page` | | `string` | `undefined` |
| `logoLabel` | `logo-label` | | `string` | `undefined` |
| `logoUrl` | `logo-url` | | `string` | `undefined` |
| `menuButtonBreadcrumbReturn` | `menu-button-breadcrumb-return` | | `string` | `undefined` |
| `menuButtonSubmenuExpand` | `menu-button-submenu-expand` | | `string` | `undefined` |
| `menuIsOpen` | `menu-is-open` | | `boolean` | `true` |
| `menuType` | `menu-type` | | `MenuType.desktop \| MenuType.mobile \| MenuType.sidenav \| MenuType.sidepanel \| MenuType.tablet` | `MenuType.desktop` |
## Events
......
src/components/site-header/readme.md
+ 11
− 11
View file @ 3a01aaa3
......@@ -4,17 +4,17 @@
## Properties
| Property | Attribute | Description | Type | Default |
| ---------------------- | ------------------------- | ----------- | ---------------------------------------------------------------------------- | ------------------ |
| `dataDesktopLinks` | `data-desktop-links` | | `DesktopLinks[] \| string` | `undefined` |
| `dataMenuDonate` | `data-menu-donate` | | `string` | `undefined` |
| `dataMenuLanguage` | `data-menu-language` | | `string` | `undefined` |
| `dataSiteHeaderLabels` | `data-site-header-labels` | | `string` | `undefined` |
| `logoLabel` | `logo-label` | | `string` | `undefined` |
| `logoUrl` | `logo-url` | | `string` | `undefined` |
| `menuLabelClose` | `menu-label-close` | | `string` | `undefined` |
| `menuLabelOpen` | `menu-label-open` | | `string` | `undefined` |
| `menuType` | `menu-type` | | `MenuType.desktop \| MenuType.mobile \| MenuType.sidenav \| MenuType.tablet` | `MenuType.default` |
| Property | Attribute | Description | Type | Default |
| ---------------------- | ------------------------- | ----------- | -------------------------------------------------------------------------------------------------- | ------------------ |
| `dataDesktopLinks` | `data-desktop-links` | | `DesktopLinks[] \| string` | `undefined` |
| `dataMenuDonate` | `data-menu-donate` | | `string` | `undefined` |
| `dataMenuLanguage` | `data-menu-language` | | `string` | `undefined` |
| `dataSiteHeaderLabels` | `data-site-header-labels` | | `string` | `undefined` |
| `logoLabel` | `logo-label` | | `string` | `undefined` |
| `logoUrl` | `logo-url` | | `string` | `undefined` |
| `menuLabelClose` | `menu-label-close` | | `string` | `undefined` |
| `menuLabelOpen` | `menu-label-open` | | `string` | `undefined` |
| `menuType` | `menu-type` | | `MenuType.desktop \| MenuType.mobile \| MenuType.sidenav \| MenuType.sidepanel \| MenuType.tablet` | `MenuType.default` |
## Dependencies
......
src/components/site-header/site-logo/readme.md
+ 2
− 0
View file @ 3a01aaa3
......@@ -17,6 +17,7 @@
- [hy-footer-base](../../footer/hy-footer-base)
- [hy-menu](../../navigation/menu)
- [hy-menu-sidebar](../../navigation/menu-sidebar)
- [hy-site-header](..)
- [hy-user-login-form](../../hy-user-login-form)
......@@ -31,6 +32,7 @@ graph TD;
hy-site-logo --> hy-icon
hy-footer-base --> hy-site-logo
hy-menu --> hy-site-logo
hy-menu-sidebar --> hy-site-logo
hy-site-header --> hy-site-logo
hy-user-login-form --> hy-site-logo
style hy-site-logo fill:#f9f,stroke:#333,stroke-width:4px
......
src/index.html
+ 76
− 1
View file @ 3a01aaa3
......@@ -984,7 +984,82 @@
</div>
<aside class="layout-sidebar-first" role="complementary">
THIS IS SIDEBAR
<hy-menu-sidebar slot="menu" menu-type="sidenav" open="true" is-demo="true">
<hy-menu-level-container menu-type="sidenav" menu-level="1">
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="1" url="#" label="News">
<hy-menu-level-container menu-type="sidenav" menu-level="2">
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="2" url="#" label="News"></hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-item-sidebar>
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="42345" url="#" label="Research">
<hy-menu-level-container menu-type="sidenav" menu-level="2">
<hy-menu-item-sidebar
menu-type="sidenav"
menu-link-id="123"
url="#"
label="Top Research"
></hy-menu-item-sidebar>
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="22" url="#" label="Middle Research">
<hy-menu-level-container menu-type="sidenav" menu-level="3">
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="232" url="#" label="Middle Top Research">
<hy-menu-level-container menu-type="sidenav" menu-level="4">
<hy-menu-item-sidebar
menu-type="sidenav"
menu-link-id="21"
url="#"
label="Top"
></hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-item-sidebar>
<hy-menu-item-sidebar
menu-type="sidenav"
menu-link-id="242"
url="#"
label="Middle Middle Research"
></hy-menu-item-sidebar>
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="252" url="#" label="Middle Bottom Research">
<hy-menu-level-container menu-type="sidenav" menu-level="4">
<hy-menu-item-sidebar
menu-type="sidenav"
menu-link-id="2134"
url="#"
label="Bottom"
></hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-item-sidebar>
<hy-menu-item-sidebar
menu-type="sidenav"
menu-link-id="222"
url="#"
label="Bottom Research"
></hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-item-sidebar>
<hy-menu-item-sidebar
menu-type="sidenav"
menu-link-id="4905"
url="#"
label="Admissions"
></hy-menu-item-sidebar>
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="4776" url="#" label="Cooperation">
<hy-menu-level-container menu-type="sidenav" menu-level="2">
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="455725" url="#" label="Admissions 2">
<hy-menu-level-container menu-type="sidenav" menu-level="3">
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="4235653" url="#" label="Admissions 2">
<hy-menu-level-container menu-type="sidenav" menu-level="4">
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="1235653" url="#" label="Admissions 3">
</hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-item-sidebar>
<hy-menu-item-sidebar menu-type="sidenav" menu-link-id="47" url="#" label="About us"></hy-menu-item-sidebar>
</hy-menu-level-container>
</hy-menu-sidebar>
</aside>
</hy-main>
<div style="max-width: 1216px; margin: 0 auto;">
......
src/utils/utils.ts
+ 1
− 0
View file @ 3a01aaa3
......@@ -130,6 +130,7 @@ export enum GridAlignVariants {
export enum MenuType {
desktop = 'desktop',
sidenav = 'sidenav',
sidepanel = 'sidepanel',
mobile = 'mobile',
tablet = 'tabled',
default = 'desktop',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment