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

fix: tup-615 inconsistent header spacing - left & vertical #339

Merged
merged 46 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c0d1ff5
feat: tup-615 small header buttons (#338)
wesleyboar Oct 10, 2023
5b00457
feat: tup-615 my account header (#340)
wesleyboar Oct 10, 2023
34a7322
fix: inconsistent header spacing (#341)
wesleyboar Oct 10, 2023
25e10b9
fix: tup-615 flexible space above dashboard header (#342)
wesleyboar Oct 10, 2023
f027640
fix: project ticket grid too much middle space
wesleyboar Sep 26, 2023
af717a0
docs: more css thoughts in comment
wesleyboar Oct 11, 2023
6616d03
docs: more css thoughts in comment
wesleyboar Oct 11, 2023
d65bbf2
feat: tup-619 c-content block migration (#346)
R-Tomas-Gonzalez Oct 16, 2023
fd34bdc
feat: tup-623 c-update migration (#348)
R-Tomas-Gonzalez Oct 16, 2023
65d0e0d
feat: tup-624: added generics/attributes to demo (#345)
R-Tomas-Gonzalez Oct 16, 2023
9e90907
feat/tup-625: Migrate o-heading-steps to core-styles (#349)
R-Tomas-Gonzalez Oct 17, 2023
caf95c0
feat/tup-630: Migrate django.cms.blog.app.item (#351)
R-Tomas-Gonzalez Oct 19, 2023
b2d9f2b
Merge branch 'main' into feat/tup-463
wesleyboar Nov 1, 2023
fcd4dc4
feat/tup-632: Migrate django.cms.picture.css to core-cms (#355)
R-Tomas-Gonzalez Nov 2, 2023
73d673c
Merge branch 'main' into feat/tup-463
wesleyboar Nov 2, 2023
a087d26
Migrate c-card fixes to core-styles (#361)
R-Tomas-Gonzalez Nov 2, 2023
65a8e8e
Merge branch 'main' into fix/tup-615-header-spacing-consistency
wesleyboar Nov 3, 2023
fcb4a3e
Migrated header to Core-Styles (#359)
R-Tomas-Gonzalez Nov 3, 2023
23b6fd8
fix: tup-617 c-button font-weight redunant style (#364)
wesleyboar Nov 3, 2023
88c0da4
feat(tup-cms): core-cms with core-styles v2.19
wesleyboar Nov 3, 2023
23dd0d9
Merge branch 'main' into feat/tup-463
wesleyboar Nov 3, 2023
c7e5cd4
chore: lowercase comment
wesleyboar Nov 3, 2023
65c88a9
feat(tup-cms)!: core-cms with core-styles v2.19
wesleyboar Nov 3, 2023
aca968f
feat/tup-634: Migrate pseudo-elements to core-cms (#358)
R-Tomas-Gonzalez Nov 6, 2023
457c6c9
feat/tup-625: delete u-highlight stylesheet (#352)
R-Tomas-Gonzalez Nov 6, 2023
7da8bbb
Migrate card list support to core-styles (#360)
R-Tomas-Gonzalez Nov 6, 2023
a67b340
feat/tup-626: delete o-section from tup-ui (#353)
R-Tomas-Gonzalez Nov 6, 2023
474edaf
feat/tup-633: Migrate lightgallery to core-cms (#357)
R-Tomas-Gonzalez Nov 6, 2023
032bfd2
feat/tup-629: delete footer (#356)
R-Tomas-Gonzalez Nov 6, 2023
960194f
removing all card--image styles (#365)
R-Tomas-Gonzalez Nov 6, 2023
adc9336
Merge branch 'main' into fix/tup-615-header-spacing-consistency
jarosenb Nov 6, 2023
0dcd2ca
chore: tup-616 migrate c-button styles to core-cms (#343)
wesleyboar Nov 7, 2023
b3d2ba9
Merge branch 'main' into fix/tup-615-header-spacing-consistency
wesleyboar Nov 9, 2023
b0d490b
feat/tup-622 migrate c-pill to core-styles (#367)
R-Tomas-Gonzalez Nov 9, 2023
2689615
fix: tup-615 prevent too tall proj's-tickets table
wesleyboar Nov 9, 2023
d33b976
feat/tup-640 Delete c-card and c-content-block imports (#368)
R-Tomas-Gonzalez Nov 10, 2023
7eab674
Merge branch 'main' into feat/tup-463
wesleyboar Nov 10, 2023
1b0dd28
feat(tup-cms): core-cms with core-styles v2.20
wesleyboar Nov 13, 2023
0e84c10
Merge branch 'feat/tup-463' of github.com:TACC/tup-ui into feat/tup-463
wesleyboar Nov 13, 2023
3167014
feat(tup-ui): core-styles v2.20
wesleyboar Nov 13, 2023
d6215e3
Merge branch 'main' into fix/tup-615-header-spacing-consistency
wesleyboar Nov 14, 2023
0e222ee
Merge branch 'feat/tup-463' into fix/tup-615-header-spacing-consistency
wesleyboar Nov 14, 2023
960597a
Merge branch 'main' into fix/tup-615-header-spacing-consistency
wesleyboar Nov 14, 2023
c714a54
Merge branch 'main' into fix/tup-615-header-spacing-consistency
wesleyboar Nov 14, 2023
f6b7bd5
Revert "Merge branch 'feat/tup-463' into fix/tup-615-header-spacing-c…
wesleyboar Nov 14, 2023
16c2c0c
fix: tup-598 sysmon horz. cut off
wesleyboar Nov 14, 2023
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
7 changes: 7 additions & 0 deletions apps/tup-ui/src/main.global.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@
--global-space--section-bottom: 30px;
--global-space--section-left: 20px;
--global-space--section-right: 30px;
/* NOTE: Unexpectedly required to apply the above var changes */
/* HELP: Why isn't Core-Styles `--global-space--section` auto-updated? */
--global-space--section:
var(--global-space--section-top)
var(--global-space--section-right)
var(--global-space--section-bottom)
var(--global-space--section-left);
}

/* To stretch application height to available space */
Expand Down
6 changes: 3 additions & 3 deletions apps/tup-ui/src/pages/Dashboard/Dashboard.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
grid-template-columns: 0.5fr 0.5fr;
}
@media (--x-wide-and-above) {
grid-template-columns: 0.65fr 0.35fr;
grid-template-columns: 0.6fr 0.4fr;
Copy link
Member Author

@wesleyboar wesleyboar Nov 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This performs #369 again (see 16c2c0c), but is tested at 100% zoom.1

Footnotes

  1. Seems I had tested Fix/tup 598 running jobs cut off #369 at 90% zoom. 🫤

}
}
.panels > * {
Expand All @@ -51,14 +51,14 @@
display: grid;
gap: 25px;
grid-template-columns: 1fr;
grid-template-rows: auto 1fr;
grid-template-rows: 0.5fr 1fr;
grid-template-areas:
"projects"
"tickets";

@media (--wide-and-below) {
row-gap: 25px;
grid-template-rows: auto auto;
grid-template-rows: 300px 300px;
}
}

Expand Down
4 changes: 3 additions & 1 deletion apps/tup-ui/src/pages/Projects/Projects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import styles from './Projects.module.css';

const NewProject = () => (
<a href="https://submit-tacc.xras.org/" target="_blank" rel="noreferrer">
<Button type="primary">+ New Project</Button>
<Button type="primary" size="small">
+ New Project
</Button>
</a>
);

Expand Down
8 changes: 2 additions & 6 deletions libs/core-components/src/lib/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,8 @@ type ButtonTypeLinkSize = {
type?: 'link';
size?: never;
};
type ButtonTypePrimarySize = {
type?: 'primary';
size?: 'short' | 'medium' | 'long';
};
type ButtonTypeOtherSize = {
type?: 'secondary' | 'tertiary' | 'active';
type?: 'primary' | 'secondary' | 'tertiary' | 'active';
size?: 'short' | 'medium' | 'long' | 'small';
};

Expand All @@ -48,7 +44,7 @@ type ButtonProps = React.PropsWithChildren<{
attr?: 'button' | 'submit' | 'reset';
isLoading?: boolean;
}> &
(ButtonTypeLinkSize | ButtonTypePrimarySize | ButtonTypeOtherSize);
(ButtonTypeLinkSize | ButtonTypeOtherSize);

const Button: React.FC<ButtonProps> = ({
children,
Expand Down
8 changes: 3 additions & 5 deletions libs/tup-components/src/accounts/ManageAccount.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
.account-header {
font-size: 2rem;
border-bottom: 1px solid #707070;
padding: 10px;
}
.account-header > i {
font-size: 32px;
margin-bottom: -6px;
.account-header i {
vertical-align: middle;
margin-top: -0.25em;
margin-right: 0.5rem;

}

.account-body {
Expand Down
6 changes: 3 additions & 3 deletions libs/tup-components/src/accounts/ManageAccount.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Icon, Button } from '@tacc/core-components';
import { Icon, Button, SectionHeader } from '@tacc/core-components';
import { useProfile } from '@tacc/tup-hooks';
import { AccountMfa } from './ManageAccountMfa';
import styles from './ManageAccount.module.css';
Expand Down Expand Up @@ -94,12 +94,12 @@ const ManageAccount: React.FC = () => {
return (
<section>
<article className={styles['account-layout']}>
<header className={styles['account-header']}>
<SectionHeader className={styles['account-header']} isNestedHeader>
<Icon name="user" />
<span>
{data?.firstName} {data?.lastName}
</span>
</header>
</SectionHeader>
<div className={styles['account-body']}>
<section>
<ManageUser />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import styles from './TicketCreateModal.module.css';

const TicketCreateModal: React.FC<
React.PropsWithChildren<{
display: 'secondary' | 'link';
display: 'secondary' | 'link' | 'primary';
size?: 'small';
}>
> = ({ children, size, display }) => {
Expand All @@ -23,8 +23,8 @@ const TicketCreateModal: React.FC<

return (
<>
{display === 'secondary' && (
<Button onClick={() => toggle()} type="secondary" size={size}>
{display !== 'link' && (
<Button onClick={() => toggle()} type={display} size={size}>
{children}
</Button>
)}
Expand Down
2 changes: 1 addition & 1 deletion libs/tup-components/src/tickets/Tickets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const Tickets: React.FC = () => {
<section className={styles['tickets-section']}>
<SectionHeader
actions={
<TicketCreateModal display="secondary">
<TicketCreateModal display="secondary" size="small">
+ New Ticket
</TicketCreateModal>
}
Expand Down
Loading