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

Bug/schlechter oder kein umbruch bei vergoesserung #5719

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
be40575
fix button width and button access-key
anicyne Dec 7, 2023
3b28270
fix toast display to adjust to window width for visibility
anicyne Dec 7, 2023
6cb20f2
fix toast display to adjust to window width for visibility (zoll v3)
anicyne Dec 7, 2023
ba79a08
fix link-button (text wrepping issue)
anicyne Dec 7, 2023
79ae614
Make card selection responsive
anicyne Dec 7, 2023
d8d21bf
Merge branch 'public-ui:develop' into bug/schlechter-oder-kein-umbruc…
anicyne Dec 7, 2023
3ce56c1
Enable horizontal scrolling for table and adjust table with pagination
anicyne Dec 7, 2023
a4df192
Merge branch 'develop' into bug/schlechter-oder-kein-umbruch-bei-verg…
sdvg Dec 7, 2023
f39dd42
update Flexbox card-section / Adjust table for horizontal scrolling
anicyne Dec 8, 2023
c312fc9
Merge branch 'bug/schlechter-oder-kein-umbruch-bei-vergoesserung' of …
anicyne Dec 8, 2023
a3eaa9c
overflow-x entfernen (pagination)
anicyne Dec 8, 2023
d5d984c
Merge branch 'develop' into bug/schlechter-oder-kein-umbruch-bei-verg…
sdvg Dec 14, 2023
a542720
Adjust pagination spacing and set Toast width
anicyne Dec 14, 2023
33537bb
Merge branch 'bug/schlechter-oder-kein-umbruch-bei-vergoesserung' of …
anicyne Dec 14, 2023
cf32a9f
Merge branch 'develop' into bug/schlechter-oder-kein-umbruch-bei-verg…
sdvg Dec 15, 2023
50f53b5
Fix formatting issue
anicyne Dec 18, 2023
21add25
Fix formatting issue
anicyne Dec 18, 2023
2d4202f
Update snapshots
sdvg Dec 18, 2023
40a628c
Update bzst snapshots
sdvg Dec 18, 2023
ca03595
Update bzst snapshots
sdvg Dec 18, 2023
249c5a8
Merge branch 'develop' into bug/schlechter-oder-kein-umbruch-bei-verg…
sdvg Dec 19, 2023
2202776
Update all snapshots
Dec 19, 2023
bcd99b6
Merge branch 'develop' of https://github.com/cyrinermd/kolibri into b…
anicyne Dec 19, 2023
cf13f9b
Merge branch 'bug/schlechter-oder-kein-umbruch-bei-vergoesserung' of …
anicyne Dec 19, 2023
0f006c7
Merge branch 'develop' into bug/schlechter-oder-kein-umbruch-bei-verg…
deleonio Dec 19, 2023
07ebb95
Remove darwin snapshots
sdvg Dec 19, 2023
5756bef
Merge branch 'develop' of https://github.com/cyrinermd/kolibri into b…
anicyne Dec 20, 2023
6d34612
Update all snapshots
Dec 21, 2023
b5a0058
Merge branch 'develop' into bug/schlechter-oder-kein-umbruch-bei-verg…
sdvg Dec 21, 2023
206b35d
Merge branch 'develop' of https://github.com/cyrinermd/kolibri into b…
anicyne Jan 3, 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
11 changes: 11 additions & 0 deletions packages/components/src/components/table/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,23 @@
order: 2;
}

div.pagination kol-pagination {
display: flex;
flex-wrap: wrap;
}

div.pagination,
div.pagination > div:last-child {
display: grid;
place-items: center;
}

@media (max-width: 1024px) {
div.pagination kol-pagination {
flex-direction: column;
}
deleonio marked this conversation as resolved.
Show resolved Hide resolved
}

@media (min-width: 1024px) {
div.pagination,
div.pagination > div:last-child {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { KolButton } from '@public-ui/react';
import React, { FC } from 'react';

export const ButtonAccessKey: FC = () => (
<div className="flex gap-4">
<div className="flex flex-wrap gap-4">
<KolButton _label="Mit S access key" _accessKey="S"></KolButton>
<KolButton _label="Sehr kleines s" _accessKey="s"></KolButton>
<KolButton _label="Access key kommt nicht in label vor" _accessKey="x"></KolButton>
Expand Down
4 changes: 2 additions & 2 deletions packages/samples/react/src/components/button/width.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ const ARGS = {

export const ButtonWidth: FC = () => (
<div className="grid gap-14">
<div className="flex flex-warp gap-14">
<div className="flex flex-wrap gap-14">
<KolButton _label="Primary" _variant="primary" {...ARGS}></KolButton>
<KolButton _label="Secondary" _variant="secondary" {...ARGS}></KolButton>
<KolButton _label="Normal" _variant="normal" {...ARGS}></KolButton>
<KolButton _label="Danger" _variant="danger" {...ARGS}></KolButton>
<KolButton _label="Ghost" _variant="ghost" {...ARGS}></KolButton>
</div>
<div className="flex flex-warp gap-14">
<div className="flex flex-wrap gap-14">
<KolButton _disabled _label="Primary" _variant="primary" {...ARGS}></KolButton>
<KolButton _disabled _label="Secondary" _variant="secondary" {...ARGS}></KolButton>
<KolButton _disabled _label="Normal" _variant="normal" {...ARGS}></KolButton>
Expand Down
8 changes: 4 additions & 4 deletions packages/samples/react/src/components/card/selection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ const STYLE = {
};

export const CardSelection: FC = () => (
<div className="flex gap-2">
<KolCard _label="DEBTI-25437/17-1">
<div className="flex flex-wrap gap-2">
<KolCard _label="DEBTI-25437/17-1" className="lg:w-[calc(33.33%-16px)] md:w-[calc(50%-16px)] sm:w-full">
<div>
<div>
TeCorp Endplatte
Expand All @@ -32,7 +32,7 @@ export const CardSelection: FC = () => (
</div>
</div>
</KolCard>
<KolCard _label="DEBTI-25437/17-1">
<KolCard _label="DEBTI-25437/17-1" className="lg:w-[calc(33.33%-16px)] md:w-[calc(50%-16px)] sm:w-full">
<div>
<div>
TeCorp Endplatte
Expand All @@ -52,7 +52,7 @@ export const CardSelection: FC = () => (
</div>
</div>
</KolCard>
<KolCard _label="DEBTI-25437/17-1">
<KolCard _label="DEBTI-25437/17-1" className="lg:w-[calc(33.33%-16px)] md:w-[calc(50%-16px)] sm:w-full">
<div>
<div>
TeCorp Endplatte
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const ARGS = {

export const LinkButtonBasic: FC = () => (
<div className="grid gap-14">
<div className="flex flex-warp gap-14">
<div className="flex flex-wrap gap-14">
<KolLinkButton _label="Primary" _variant="primary" {...ARGS}></KolLinkButton>
<KolLinkButton _label="Secondary" _variant="secondary" {...ARGS}></KolLinkButton>
<KolLinkButton _label="Normal" _variant="normal" {...ARGS}></KolLinkButton>
Expand Down
5 changes: 3 additions & 2 deletions packages/samples/react/src/components/table/badge-size.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ const DATE_FORMATTER = Intl.DateTimeFormat('de-DE', {
const HEADERS: KoliBriTableHeaders = {
horizontal: [
[
{ label: 'order', key: 'order', textAlign: 'center' },
{ label: 'order', key: 'order', textAlign: 'center', width: '10em' },
{
label: 'date',
key: 'date',
textAlign: 'center',
width: '20em',
render: (_el, _cell, tupel) => DATE_FORMATTER.format((tupel as Data).date),
sort: (data: Data[]) =>
data.sort((data0, data1) => {
Expand Down Expand Up @@ -48,4 +49,4 @@ const HEADERS: KoliBriTableHeaders = {
],
};

export const TableBadgeSize: FC = () => <KolTable _label="Sort a date column" _data={DATA} _headers={HEADERS} className="block" />;
export const TableBadgeSize: FC = () => <KolTable _label="Sort a date column" _data={DATA} _headers={HEADERS} className="block min-w-75em" />;
5 changes: 3 additions & 2 deletions packages/samples/react/src/components/table/render-cell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import { SampleDescription } from '../SampleDescription';
const HEADERS: KoliBriTableHeaders = {
horizontal: [
[
{ label: '#', key: 'order', textAlign: 'center' },
{ label: '#', key: 'order', textAlign: 'center', width: '10em' },
{
label: 'Datum (string)',
key: 'date',
width: '20em',
textAlign: 'center',
render: (el, tupel) => {
// https://reactjs.org/docs/portals.html
Expand Down Expand Up @@ -51,6 +52,6 @@ export const TableRenderCell: FC = () => (
<SampleDescription>
<p>This sample simulates the usage of React render functions for the table column contents.</p>
</SampleDescription>
<KolTable _label="Sort a date column" _data={DATA} _headers={HEADERS} className="block" />
<KolTable _label="Sort a date column" _data={DATA} _headers={HEADERS} className="block min-w-75em" />
</>
);
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/themes/bmf/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,7 @@ export const BMF = KoliBri.createTheme('bmf', {
top: 1rem;
right: 1rem;
width: 440px;
max-width: 100%;
}
.toast {
margin-top: 1rem;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/themes/default/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1859,6 +1859,7 @@ export const DEFAULT = KoliBri.createTheme('default', {
top: 1rem;
right: 1rem;
width: 440px;
max-width: 100%;
}
.toast {
margin-top: 1rem;
Expand Down
1 change: 1 addition & 0 deletions packages/themes/ecl/src/ecl-ec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,7 @@ export const ECL_EC = KoliBri.createTheme('ecl-ec', {
top: 1rem;
right: 1rem;
width: 440px;
max-width: 100%;
}
.toast {
display: block;
Expand Down
1 change: 1 addition & 0 deletions packages/themes/ecl/src/ecl-eu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1598,6 +1598,7 @@ export const ECL_EU = KoliBri.createTheme('ecl-eu', {
top: 1rem;
right: 1rem;
width: 440px;
max-width: 100%;
}
.toast {
display: block;
Expand Down
1 change: 1 addition & 0 deletions packages/themes/itzbund/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,7 @@ export const ITZBund = KoliBri.createTheme('itzbund', {
'KOL-TOAST-CONTAINER': `:host {
top: 1rem;
width: 750px;
max-width: 100%;
left: 50%;
transform: translateX(-50%);
}
Expand Down
Loading