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

Update table, page and layout styles #391

Merged
merged 9 commits into from
Jan 19, 2023
Merged

Update table, page and layout styles #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fa8d081
Table styles, scroll horizontal on mobile overflow
LanesGood Jan 18, 2023
fd6fbbf
Adjust page section, team and base layout styles
LanesGood Jan 18, 2023
ea31eba
Heavier label font weight
LanesGood Jan 18, 2023
298aa58
Adjust edit page sections
LanesGood Jan 18, 2023
247acc5
Make profile modal larger, sticky header
LanesGood Jan 18, 2023
222014c
Sidebar buttons
LanesGood Jan 18, 2023
01ed684
Remove logout button from home card
LanesGood Jan 18, 2023
514d9ff
Consistent button sizes, page titles, form wrapper
LanesGood Jan 18, 2023
3c7390b
Add Team belongs to Organization checkbox
LanesGood Jan 19, 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
4 changes: 3 additions & 1 deletion src/components/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const ButtonStyles = css.global`
text-align: center;
justify-content: center;
align-items: center;
gap: 0.25rem;
white-space: nowrap;
vertical-align: middle;
line-height: 1.5rem;
Expand Down Expand Up @@ -193,6 +192,7 @@ export default function Button({
.button {
min-width: 1.75rem;
min-height: 1.75rem;
gap: ${useIcon && '0.25rem'};
}
.button::after {
content: '';
Expand Down Expand Up @@ -230,6 +230,7 @@ export default function Button({
.button {
min-width: 1.75rem;
min-height: 1.75rem;
gap: ${useIcon && '0.25rem'};
}
.button::after {
content: '';
Expand Down Expand Up @@ -265,6 +266,7 @@ export default function Button({
.button {
min-width: 1.75rem;
min-height: 1.75rem;
gap: ${useIcon && '0.25rem'};
}
.button::after {
content: '';
Expand Down
41 changes: 26 additions & 15 deletions src/components/edit-team-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { useState } from 'react'
import { Formik, Field, Form } from 'formik'
import descriptionPopup from './description-popup'
import urlRegex from 'url-regex'
Expand Down Expand Up @@ -38,6 +38,7 @@ export default function EditTeamForm({
teamTags = [],
profileValues,
}) {
const [orgTeam, setOrgTeam] = useState(false)
if (profileValues) {
initialValues.tags = {}
profileValues.forEach(({ id, value }) => {
Expand Down Expand Up @@ -168,22 +169,32 @@ export default function EditTeamForm({
non-members.
</small>
</div>
{staff && isCreateForm ? (
{staff && isCreateForm && (
<div className='form-control form-control__vertical'>
<label htmlFor='organization'>Add to Organization</label>
<Field as='select' name='organization'>
<option value=''>No organization</option>
{uniqueOrgs.map(({ organization_id, name }) => {
return (
<option key={organization_id} value={organization_id}>
{name}
</option>
)
})}
</Field>
<label htmlFor='orgTeam-checkbox'>
<input
id='orgTeam-checkbox'
name='orgTeam-checkbox'
type='checkbox'
checked={orgTeam}
style={{ minWidth: '1rem' }}
onChange={(e) => setOrgTeam(e.target.checked)}
/>
This team belongs to an organization
</label>
{orgTeam && (
<Field as='select' name='organization'>
<option value=''>Select organization</option>
{uniqueOrgs.map(({ organization_id, name }) => {
return (
<option key={organization_id} value={organization_id}>
{name}
</option>
)
})}
</Field>
)}
</div>
) : (
''
)}
{extraOrgTeamFields.length > 0 ? (
<>
Expand Down
41 changes: 28 additions & 13 deletions src/components/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,14 @@ export const globalStyles = css.global`

.inner.page section {
margin-bottom: calc(${theme.layout.globalSpacing} * 2);
background: white;
padding: 2rem;
border: 2px solid ${theme.colors.primaryColor};
}

.page__heading {
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: flex-start;
margin-bottom: ${theme.layout.globalSpacing};
Expand All @@ -84,6 +88,7 @@ export const globalStyles = css.global`
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: baseline;
margin-bottom: 0.5rem;
}

Expand All @@ -94,7 +99,6 @@ export const globalStyles = css.global`
}
.section-actions {
flex-direction: row;
align-items: baseline;
}
}

Expand Down Expand Up @@ -187,6 +191,9 @@ export const globalStyles = css.global`
flex-direction: column;
align-items: flex-start;
}
.form-control__vertical label {
font-weight: 600;
}
.justify-start {
justify-content: flex-start;
}
Expand Down Expand Up @@ -252,19 +259,27 @@ export const globalStyles = css.global`
max-width: 100%;
}

// FEEDBACK BUTTON
#feedback {
position: fixed;
right: -2rem;
bottom: 12rem;
z-index: 1200;
transform: rotate(-90deg);
background: ${theme.colors.secondaryColor};
color: white;
overflow: hidden;
}
#feedback:hover {
opacity: 1;
background: #e04d2d;
display: none;
}
@media screen and (min-width: ${theme.mediaRanges.small}) {
#feedback {
display: inline-flex;
position: fixed;
right: -2rem;
bottom: 6rem;
z-index: 1200;
transform: rotate(-90deg);
background: ${theme.colors.secondaryColor};
color: white;
overflow: hidden;
box-shadow: none;
}
#feedback:hover {
opacity: 1;
background: #e04d2d;
}
}
`
function Layout(props) {
Expand Down
Loading