Skip to content

Commit

Permalink
Merge branch 'master' into feature/update-toast-design
Browse files Browse the repository at this point in the history
  • Loading branch information
spli02 committed Oct 29, 2024
2 parents 1ab99b2 + 42da881 commit 5430fe8
Show file tree
Hide file tree
Showing 20 changed files with 407 additions and 23 deletions.
5 changes: 5 additions & 0 deletions .idea/.gitignore

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

12 changes: 12 additions & 0 deletions .idea/baklava.iml

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

12 changes: 12 additions & 0 deletions .idea/material_theme_project_new.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

4 changes: 3 additions & 1 deletion app/lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ export { Spinner } from '../src/components/graphics/Spinner/Spinner.tsx';

export { PropertyList } from '../src/components/lists/PropertyList/PropertyList.tsx';

export { Tabs } from '../src/components/navigations/Tabs/Tabs.tsx';
export { Tab, Tabs } from '../src/components/navigations/Tabs/Tabs.tsx';
export { Stepper } from '../src/components/navigations/Stepper/Stepper.tsx';

export { DropdownMenu } from '../src/components/overlays/DropdownMenu/DropdownMenu.tsx';
export { Modal } from '../src/components/overlays/Modal/Modal.tsx';
export { type ToastContent, ToastProvider, ToastMessage } from '../src/components/overlays/Toast/Toast.tsx';
export { Tooltip } from '../src/components/overlays/Tooltip/Tooltip.tsx';
export { TooltipProvider } from '../src/components/overlays/Tooltip/TooltipProvider.tsx';

// Layouts

Expand Down
4 changes: 4 additions & 0 deletions src/assets/icons/_icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ export const icons = {
'edit': {},
'email': {},
'eye': {},
'file': {},
'file-error': {},
'fortanix-ki': {},
'folder': {},
'graph': {},
'groups': {},
'hide': {},
'home': {},
Expand Down
17 changes: 17 additions & 0 deletions src/assets/icons/file-error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions src/assets/icons/file.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/assets/icons/folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/icons/graph.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions src/components/actions/Button/Button.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
/* letter-spacing: 0.1ch; */
text-transform: uppercase;

@media (prefers-reduced-motion: no-preference) {
transition: none 150ms ease-in-out;
transition-property: border, background, color;
}

/* Tertiary (default) */
border-color: transparent;
background-color: transparent;
Expand Down Expand Up @@ -72,6 +67,11 @@
--bk-button-color-contrast: #{bk.$theme-button-primary-text-non-active};
cursor: not-allowed;
}

@media (prefers-reduced-motion: no-preference) {
transition: none 150ms ease-in-out;
transition-property: border, background, color;
}

/* & > :global(.icon) { font-size: 1.2rem; } */

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/* Copyright (c) Fortanix, Inc.
|* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not
|* distributed with this file, you can obtain one at http://mozilla.org/MPL/2.0/. */

@use '../../../styling/defs.scss' as bk;

@layer baklava.components {
.bk-placeholder-empty {
@include bk.component-base(bk-placeholder-empty);
display: flex;
align-items: center;
flex-direction: column;

&.bk-placeholder-empty--large {
gap: bk.$spacing-6;

.bk-placeholder-empty__icon {
--bk-icon-size: 6rem;
max-height: 5rem;
}

.bk-placeholder-empty__content {
gap: bk.$spacing-4;
}

.bk-placeholder-empty__content__title {
font-size: 20px;
line-height: 20px;
}
}

&.bk-placeholder-empty--small {
gap: bk.$spacing-4;

.bk-placeholder-empty__icon {
--bk-icon-size: 4rem;
max-height: 3rem;
}

.bk-placeholder-empty__content {
gap: bk.$spacing-2;
}

.bk-placeholder-empty__content__title {
font-size: 14px;
line-height: 14px;
}
}

.bk-placeholder-empty__icon {
color: bk.$theme-empty-state-stoke-default;
}

.bk-placeholder-empty__content {
display: flex;
align-items: center;
flex-direction: column;
}

.bk-placeholder-empty__content__title {
color: bk.$theme-text-heading-default;
font-family: bk.$font-family-display;
}

.bk-placeholder-empty__content__subtitle {
max-width: 50%;
text-align: center;
}

.bk-placeholder-empty__content__action {
display: flex;
align-items: center;
gap: bk.$spacing-4;
}
}
}
Loading

0 comments on commit 5430fe8

Please sign in to comment.