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.

Sign up for GitHub

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(app): Fix alignment issues in modals, fix titlebar on page #1719

Merged
merged 6 commits into from
Jun 18, 2018
Merged

fix(app): Fix alignment issues in modals, fix titlebar on page #1719

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c94bfa
fix(app): Fix alignment issues in modals, fix titlebar on page
Kadee80 Jun 18, 2018
9e4519f
add modal page padding back in
Kadee80 Jun 18, 2018
cc4af64
squashme: update padding to avoid overflow on standard screen height
Kadee80 Jun 18, 2018
1fdc808
fix found display issues
Kadee80 Jun 18, 2018
f2f0ef1
scope flex-start to modals.css
Kadee80 Jun 18, 2018
fd50fca
remove flex-direction from flex start
Kadee80 Jun 18, 2018
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: 5 additions & 1 deletion app/src/components/LabwareCalibration/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
right: 0;
}

.modal_contents {
background-color: white;
}

.in_progress_contents {
background-color: transparent;

Expand Down Expand Up @@ -60,6 +64,6 @@
.spinner {
width: 6rem;
display: block;
margin: auto;
margin: 35vh auto auto;
color: var(--c-font-light);
}
2 changes: 1 addition & 1 deletion app/src/components/Page/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function Page (props: Props) {
return (
<main className={styles.task}>
{titleBarProps && (
<TitleBar {...titleBarProps} />
<TitleBar {...titleBarProps} className={styles.fixed_title_bar}/>
)}
{children}
</main>
Expand Down
8 changes: 8 additions & 0 deletions app/src/components/Page/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,12 @@
@apply --relative-fill;

overflow-y: auto;
padding-top: 3.5rem;
}

.fixed_title_bar {
position: fixed;
top: 0;
width: 100%;
z-index: 1;
}
13 changes: 6 additions & 7 deletions components/src/modals/modals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,21 @@
margin: 0 auto;
padding: 1rem;
border-radius: 0.5rem;
position: relative;
}
}

.modal {
@apply --absolute-fill;
@apply --center-children;
@apply --modal;

padding: 4rem;
}

.modal_page {
@apply --absolute-fill;
@apply --flex-start;

display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
padding: 5rem 2rem 1rem;
padding: 4.5rem 3rem 1rem 3rem;
}

.overlay {
Expand All @@ -40,6 +37,7 @@
top: 0;
left: 0;
right: 0;
width: 100%;
z-index: 3;
}

Expand All @@ -55,6 +53,7 @@
background-color: white;
max-height: 100%;
overflow-y: auto;
padding-top: 1rem;
}

.modal_page_heading {
Expand Down
1 change: 1 addition & 0 deletions components/src/styles/positioning.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

--flex-start: {
display: flex;
flex-direction: column;
Copy link
Contributor

Choose a reason for hiding this comment

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

This change makes --flex-start little unusable for other components (or at least, it's unexpected given its name). Can we put this on the .modal_page style itself instead?

justify-content: flex-start;
align-items: center;
}
Expand Down