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

docs: show mobile usecase #1422

Merged
merged 47 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
394e226
feat(ionic): add ionic support
danielleroux Aug 5, 2024
eef9216
fix: header in map
danielleroux Aug 5, 2024
08b6cf0
fix: update json
danielleroux Aug 5, 2024
efc693c
fix: move test-app
danielleroux Aug 6, 2024
3828eaa
fix: add ios support
danielleroux Aug 6, 2024
1d950db
docs: add to documentation
danielleroux Aug 6, 2024
a0641c7
docs: ionic info
danielleroux Aug 6, 2024
e8abdda
feat: add tabs
danielleroux Aug 6, 2024
10f396f
fix(core/modal): add safe area to modal
danielleroux Aug 7, 2024
92d77f8
chore: add changeset
danielleroux Aug 7, 2024
40d02e0
docs(mobile): merge general and technical docs
AndreasBerliner Aug 7, 2024
6221f83
fix: safe area
danielleroux Aug 7, 2024
fadc223
docs(mobile): refactor and restructure
AndreasBerliner Aug 7, 2024
411faa8
Merge branch 'feat/ionic-test-app' of github.com:siemens/ix into featโ€ฆ
AndreasBerliner Aug 7, 2024
cb185c0
docs(mobile): refactor demo app and repository sections
AndreasBerliner Aug 7, 2024
d8f3323
docs(mobile): add information and refactoring
AndreasBerliner Aug 7, 2024
05f354f
docs: preview theme
danielleroux Aug 7, 2024
03795be
docs: update docusaurus
danielleroux Aug 7, 2024
545ca9c
docs: light frame
danielleroux Aug 7, 2024
bd3c8d7
fix: load optional brand style
danielleroux Aug 8, 2024
ed10883
fix: load additonal theme
danielleroux Aug 8, 2024
b7a5cfc
chore: add ionic-test-app to ignore list
danielleroux Aug 8, 2024
328d13d
fix: add hydrated for desktop case
danielleroux Aug 8, 2024
e314de0
docs(mobile): refactoring, corrections
AndreasBerliner Aug 8, 2024
b38fa21
Merge branch 'feat/ionic-test-app' of github.com:siemens/ix into featโ€ฆ
AndreasBerliner Aug 8, 2024
99add1e
docs(mobile): fix headlines
AndreasBerliner Aug 8, 2024
4272da3
chore: add start script for ionic-test-app
danielleroux Aug 8, 2024
ba6991c
docs: video
danielleroux Aug 8, 2024
05d48cb
fix: device preview with brand
danielleroux Aug 8, 2024
f55b094
fix: ignore local theme support
danielleroux Aug 8, 2024
abc5b86
fix: style path
danielleroux Aug 8, 2024
7ad51af
renamed to align with our writing guidelines,
kathrinschalber Aug 8, 2024
809b35d
Merge branch 'feat/ionic-test-app' of https://github.com/siemens/ix iโ€ฆ
kathrinschalber Aug 8, 2024
5dd22b4
fix: theme generation for previews
danielleroux Aug 9, 2024
a579060
fix: workaround brand selector issue
danielleroux Aug 9, 2024
466a92d
fix: tweak preview
danielleroux Aug 9, 2024
38ef391
docs(mobile): add comparison table and source
AndreasBerliner Aug 9, 2024
846c5e5
docs(mobile): fix source link and typo
AndreasBerliner Aug 9, 2024
54b94c2
added pipes on table, restructured content a bit
kathrinschalber Aug 9, 2024
174d8e8
docs(mobile): fix, move source info back to table
AndreasBerliner Aug 9, 2024
5f86623
docs(mobile): change layout as discussed
AndreasBerliner Aug 9, 2024
6c1738b
docs(mobile): switch demo app and demo animation
AndreasBerliner Aug 9, 2024
a1314d0
fix: remove unused imports
danielleroux Aug 12, 2024
231aa49
fix: remove ionic components
danielleroux Aug 12, 2024
4bea308
fix: move test app
danielleroux Aug 12, 2024
990a183
fix: css vars
danielleroux Aug 12, 2024
88a0fdd
fix: remove experimental rgb values
danielleroux Aug 12, 2024
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
6 changes: 2 additions & 4 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
"changelog": [
"@changesets/changelog-github",
{ "repo": "siemens/ix" }
],
"changelog": ["@changesets/changelog-github", { "repo": "siemens/ix" }],
"commit": false,
"linked": [],
"fixed": [
Expand All @@ -22,6 +19,7 @@
"react-test-app",
"vue-test-app",
"html-test-app",
"ionic-test-app",
"figma-plugin",
"documentation"
]
Expand Down
5 changes: 5 additions & 0 deletions .changeset/thick-fireants-worry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': minor
---

feat(core): add css safe areas
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ yarn-error.log*
packages/core/components/
packages/core/hydrate/
packages/*/dist/
test-apps/*/dist/
packages/*/www/
packages/*/loader/
packages/*/dist-transpiled/
Expand All @@ -164,11 +165,17 @@ packages/*/build/
packages/core/dist-css

###
# @siemens/html-test-app
# html-test-app
###

packages/html-test-app/src/public/additional-theme

###
# ionic-test-app
###

packages/ionic-test-app/public/additional-theme

###
# documentation
###
Expand All @@ -180,6 +187,7 @@ packages/documentation/scripts/.typedoc/
packages/documentation/static/auto-generated/
packages/documentation/static/figma/
packages/documentation/static/webcomponent-examples/*
packages/documentation/static/ionic-preview
!packages/documentation/static/versioned_examples/*/webcomponent-examples

###
Expand Down
4 changes: 4 additions & 0 deletions ix.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
"name": "vue-test-app",
"path": "./packages/vue-test-app"
},
{
"name": "ionic-test-app",
"path": "./packages/ionic-test-app"
},
{
"name": "eslint-config",
"path": "./packages/eslint-config-ix"
Expand Down
37 changes: 31 additions & 6 deletions packages/core/component-doc.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,15 @@
}
],
"encapsulation": "shadow",
"dependents": [],
"dependents": [
"ix-playground-internal"
],
"dependencies": [],
"dependencyGraph": {},
"dependencyGraph": {
"ix-playground-internal": [
"ix-application"
]
},
"props": [
{
"name": "appSwitchConfig",
Expand Down Expand Up @@ -397,7 +403,8 @@
"encapsulation": "shadow",
"dependents": [
"ix-basic-navigation",
"ix-map-navigation"
"ix-map-navigation",
"ix-playground-internal"
],
"dependencies": [
"ix-menu-expand-icon",
Expand All @@ -424,6 +431,9 @@
],
"ix-map-navigation": [
"ix-application-header"
],
"ix-playground-internal": [
"ix-application-header"
]
},
"props": [
Expand Down Expand Up @@ -1228,6 +1238,7 @@
"ix-empty-state",
"ix-menu-about-news",
"ix-modal-example",
"ix-playground-internal",
"ix-split-button",
"ix-time-picker",
"ix-upload"
Expand Down Expand Up @@ -1263,6 +1274,9 @@
"ix-modal-example": [
"ix-button"
],
"ix-playground-internal": [
"ix-button"
],
"ix-split-button": [
"ix-button"
],
Expand Down Expand Up @@ -9122,7 +9136,9 @@
"docs": "",
"docsTags": [],
"encapsulation": "shadow",
"dependents": [],
"dependents": [
"ix-playground-internal"
],
"dependencies": [
"ix-menu-expand-icon",
"ix-icon-button",
Expand All @@ -9146,6 +9162,9 @@
],
"ix-tooltip": [
"ix-typography"
],
"ix-playground-internal": [
"ix-menu"
]
},
"props": [
Expand Down Expand Up @@ -11093,9 +11112,15 @@
"docs": "",
"docsTags": [],
"encapsulation": "shadow",
"dependents": [],
"dependents": [
"ix-playground-internal"
],
"dependencies": [],
"dependencyGraph": {},
"dependencyGraph": {
"ix-playground-internal": [
"ix-modal"
]
},
"props": [
{
"name": "animation",
Expand Down
1 change: 1 addition & 0 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"module": "dist/index.js",
"es2015": "dist/esm/index.mjs",
"es2017": "dist/esm/index.mjs",
"jsnext:main": "dist/esm/index.js",
"types": "dist/types/interfaces.d.ts",
"collection": "dist/collection/collection-manifest.json",
"collection:main": "dist/collection/index.js",
Expand Down
5 changes: 5 additions & 0 deletions packages/core/scss/_core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
--bs-font-sans-serif: Siemens Sans, system-ui, -apple-system, 'Segoe UI',
Roboto, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, sans-serif,
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';

--ix-safe-area-inset-top: 0rem;
--ix-safe-area-inset-right: 0rem;
--ix-safe-area-inset-bottom: 0rem;
--ix-safe-area-inset-left: 0rem;
}

body {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
@import 'mixins/shadow-dom/component';
@import 'mixins/break-points';
@import 'mixins/shadow-dom/component';
@import 'mixins/break-points';

:host {
@include ix-component;

display: flex;
align-items: center;
align-items: flex-end;
flex-wrap: nowrap;
position: relative;
width: 100%;
height: 2.75rem;
min-height: 2.75rem;
padding: 0 1rem 0 0.625rem;
height: calc(2.75rem + var(--ix-safe-area-inset-top, 0rem));
min-height: calc(2.75rem + var(--ix-safe-area-inset-top, 0rem));
padding-top: 0;
padding-right: calc(1rem + var(--ix-safe-area-inset-right, 0rem));
padding-bottom: 0.3rem;
padding-left: calc(0.625rem + var(--ix-safe-area-inset-left, 0rem));

color: var(--theme-app-header--color);
background-color: var(--theme-app-header--background);
Expand All @@ -40,6 +44,7 @@
max-width: 50%;
margin-left: 1.5rem;
margin-right: 2.5rem;
margin-bottom: 0.25rem;
color: var(--theme-app-header--color);
}

Expand Down Expand Up @@ -90,8 +95,6 @@
}

:host(.breakpoint-sm) {
padding-left: 0.625rem;

.logo {
margin-left: 0.5rem;
}
Expand Down
35 changes: 29 additions & 6 deletions packages/core/src/components/application/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,47 @@
overflow: hidden;
}

.content-area {
display: flex;
position: relative;
flex-direction: column;
flex-wrap: nowrap;
height: calc(100% - var(--ix-safe-area-inset-bottom, 0px));
width: 100%;
margin-left: var(--ix-application-menu-margin-left);
}

main {
display: block;
position: relative;
height: 100%;
flex-grow: 1;

width: 100%;
padding-bottom: var(--ix-safe-area-inset-bottom);
overflow: auto;
}

footer {
display: block;
position: relative;
width: 100%;
overflow: hidden;
}
}

:host(.breakpoint-md) {
--ix-application-menu-margin-left: 3.25rem;
--ix-application-menu-margin-left: calc(
3.25rem + var(--ix-application-menu-safe-area-left, 0rem)
);

aside.slotted {
margin-left: var(--ix-application-menu-margin-left);
}

aside.slotted + main {
aside.slotted + .content-area {
margin-left: 0;
}

aside:not(.slotted) + main {
aside:not(.slotted) + .content-area {
margin-left: var(--ix-application-menu-margin-left);
}
}
Expand All @@ -66,5 +86,8 @@
}

:host(.breakpoint-sm) {
--ix-application-menu-margin-left: 0;
--ix-application-menu-margin-left: var(
--ix-application-menu-safe-area-left,
0rem
);
}
11 changes: 8 additions & 3 deletions packages/core/src/components/application/application.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,14 @@ export class Application {
}
></slot>
</aside>
<main class="content" onClick={() => this.onContentClick()}>
<slot></slot>
</main>
<div class="content-area">
<main class="content" onClick={() => this.onContentClick()}>
<slot></slot>
</main>
<footer class="footer">
<slot name="bottom"></slot>
</footer>
</div>
</div>
</Host>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@

.map-nav-header-brand {
background-color: var(--theme-map-navigation-background);
display: flex;
align-items: center;

padding-left: $default-space;
padding-right: $default-space;
padding-bottom: 0.625rem;
height: 100%;
width: 100%;
padding: 0 $default-space;

--theme-app-header--color: var(--theme-map-navigation-header--color);
--theme-app-header-logo--color: var(--theme-map-navigation-logo--color);

Expand Down
7 changes: 4 additions & 3 deletions packages/core/src/components/menu/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ $menu-expanded-width: 16rem;
&::-webkit-scrollbar {
display: none;
}

}

.show-scrollbar {
Expand Down Expand Up @@ -88,11 +87,13 @@ $menu-expanded-width: 16rem;
display: flex;
flex-direction: column;
position: relative;
width: 3.25rem;
width: calc(3.25rem + var(--ix-application-menu-safe-area-left, 0rem));
height: 100%;
padding-block-end: 1rem;
padding-block-end: calc(1rem + var(--ix-safe-area-inset-bottom, 0rem));
overflow: hidden;

padding-left: var(--ix-application-menu-safe-area-left, 0rem);

&.expanded {
box-shadow: var(--theme-navigation--box-shadow);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@include ix-component;
display: flex;
padding: 0.5rem;
padding-bottom: 0rem;
justify-content: flex-end;
align-items: center;
gap: 0.5rem;
Expand Down
Loading
Loading